From 24fdeddc0acd65fc215849428fc93eb78f77350e Mon Sep 17 00:00:00 2001 From: Default email Date: Wed, 23 Oct 2024 09:41:50 +0300 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 2768c7d042a37de65bb1b5b3268fc987e534c49d --- .../nixpkgs/.github/workflows/basic-eval.yml | 1 + third_party/nixpkgs/CONTRIBUTING.md | 5 + third_party/nixpkgs/ci/OWNERS | 13 +- .../nixpkgs/doc/hooks/cmake.section.md | 34 +- .../doc/languages-frameworks/gnome.section.md | 10 +- .../doc/languages-frameworks/vim.section.md | 13 + .../doc/stdenv/cross-compilation.chapter.md | 25 + .../doc/stdenv/multiple-output.chapter.md | 2 +- third_party/nixpkgs/flake.nix | 31 +- .../nixpkgs/maintainers/maintainer-list.nix | 152 +- third_party/nixpkgs/maintainers/team-list.nix | 15 + .../manual/configuration/wayland.chapter.md | 13 +- .../manual/release-notes/rl-2405.section.md | 2 + .../manual/release-notes/rl-2411.section.md | 23 + .../nixpkgs/nixos/modules/misc/ids.nix | 2 +- .../nixpkgs/nixos/modules/module-list.nix | 7 +- third_party/nixpkgs/nixos/modules/rename.nix | 2 + .../nixpkgs/nixos/modules/security/pam.nix | 7 +- .../services/desktop-managers/plasma6.nix | 3 +- .../modules/services/hardware/kmonad.nix | 190 + .../nvidia-container-toolkit/default.nix | 8 +- .../modules/services/mail/cyrus-imap.nix | 379 + .../services/matrix/matrix-sliding-sync.nix | 107 - .../nixos/modules/services/misc/bazarr.nix | 4 +- .../modules/services/misc/docker-registry.nix | 7 +- .../modules/services/monitoring/netdata.nix | 1 - .../modules/services/networking/ddclient.nix | 2 +- .../services/networking/firewall-iptables.nix | 1 - .../services/networking/firewall-nftables.nix | 9 + .../modules/services/networking/firewall.nix | 5 +- .../modules/services/networking/go-camo.nix | 3 +- .../modules/services/networking/mihomo.nix | 2 +- .../modules/services/networking/shout.nix | 115 - .../modules/services/networking/sing-box.nix | 16 +- .../modules/services/networking/smokeping.nix | 5 +- .../modules/services/networking/tailscale.nix | 1 + .../modules/services/security/kanidm.nix | 1 - .../modules/services/torrent/bitmagnet.nix | 194 + .../nixos/modules/services/video/wivrn.nix | 226 + .../web-apps/nextcloud-notify_push.nix | 14 +- .../web-apps/nextcloud-whiteboard-server.nix | 72 + .../modules/services/web-apps/nextcloud.nix | 5 +- .../modules/services/web-apps/pretalx.nix | 12 +- .../modules/services/web-apps/wakapi.nix | 84 +- .../services/web-servers/nginx/default.nix | 8 - .../boot/loader/systemd-boot/systemd-boot.nix | 2 - .../virtualisation/virtualbox-guest.nix | 91 +- .../virtualisation/virtualbox-host.nix | 192 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 3 + .../nixpkgs/nixos/tests/cyrus-imap.nix | 120 + third_party/nixpkgs/nixos/tests/firewall.nix | 31 +- third_party/nixpkgs/nixos/tests/kanidm.nix | 2 +- third_party/nixpkgs/nixos/tests/keymap.nix | 68 +- third_party/nixpkgs/nixos/tests/mihomo.nix | 4 +- third_party/nixpkgs/nixos/tests/spiped.nix | 73 + third_party/nixpkgs/nixos/tests/teleport.nix | 1 - third_party/nixpkgs/nixos/tests/wakapi.nix | 40 + .../nixpkgs/nixos/tests/xmpp/ejabberd.nix | 15 + third_party/nixpkgs/pkgs/README.md | 2 + .../pkgs/applications/audio/flac/default.nix | 1 + .../audio/pocket-casts/default.nix | 8 +- .../applications/audio/polyphone/default.nix | 4 +- .../audio/tonelib-gfx/default.nix | 48 +- .../audio/youtube-music/default.nix | 2 +- .../blockchains/groestlcoin/default.nix | 16 +- .../ledger-live-desktop/default.nix | 4 +- .../applications/editors/cudatext/default.nix | 3 + .../editors/music/tuxguitar/default.nix | 48 - .../editors/neovim/ruby_provider/Gemfile.lock | 6 +- .../editors/neovim/ruby_provider/gemset.nix | 8 +- .../applications/editors/neovim/wrapper.nix | 12 +- .../vim/plugins/avante-nvim/default.nix | 9 +- .../editors/vim/plugins/blink-cmp/Cargo.lock | 572 + .../editors/vim/plugins/blink-cmp/default.nix | 50 + .../editors/vim/plugins/generated.nix | 570 +- .../vim/plugins/nvim-treesitter/generated.nix | 154 +- .../editors/vim/plugins/overrides.nix | 18 +- .../patches/ranger.nvim/fix-paths.patch | 29 +- .../editors/vim/plugins/vim-plugin-names | 9 + .../editors/vscode/extensions/default.nix | 28 +- .../myriad-dreamin.tinymist/default.nix | 2 +- .../applications/emulators/fceux/default.nix | 46 - .../file-managers/nnn/default.nix | 3 +- .../nixpkgs/pkgs/applications/gis/gmt/dcw.nix | 2 +- .../pkgs/applications/gis/gmt/default.nix | 2 +- .../pkgs/applications/gis/gmt/gshhg.nix | 2 +- .../graphics/ImageMagick/default.nix | 2 +- .../applications/graphics/drawio/default.nix | 4 +- .../graphics/foxotron/default.nix | 4 +- .../applications/graphics/ovito/default.nix | 45 +- .../graphics/viewnior/default.nix | 50 +- .../graphics/xournalpp/default.nix | 71 +- .../nixpkgs/pkgs/applications/kde/cantor.nix | 170 +- .../misc/1password-gui/default.nix | 18 +- .../pkgs/applications/misc/copyq/default.nix | 4 +- .../applications/misc/electrum/default.nix | 53 +- .../pkgs/applications/misc/fluidd/default.nix | 6 +- .../pkgs/applications/misc/gmrun/default.nix | 43 - .../find-config-file-in-system-etc-dir.patch | 18 - .../pkgs/applications/misc/gmrun/gcc43.patch | 51 - .../misc/gmrun/gmrun-0.9.2-xdg.patch | 58 - .../applications/misc/hubstaff/default.nix | 1 + .../applications/misc/input-leap/default.nix | 13 +- .../applications/misc/lunatask/default.nix | 4 +- .../applications/misc/octoprint/default.nix | 5 +- .../applications/misc/opencpn/default.nix | 13 +- .../applications/misc/pgmodeler/default.nix | 21 +- .../misc/prusa-slicer/super-slicer.nix | 5 + .../applications/misc/tellico/default.nix | 9 +- .../applications/misc/visidata/default.nix | 25 +- .../writefreely/fix-go-version-error.patch | 36 - .../pkgs/applications/misc/zine/default.nix | 7 +- .../misc/zine/update-time-crate.patch | 189 + .../networking/browsers/chromium/common.nix | 21 +- .../networking/browsers/chromium/default.nix | 6 + .../browsers/chromium/upstream-info.nix | 32 +- .../browsers/firefox-bin/beta_sources.nix | 826 +- .../firefox-bin/developer-edition_sources.nix | 826 +- .../networking/browsers/firefox/common.nix | 2 +- .../networking/browsers/firefox/packages.nix | 16 +- .../networking/browsers/floorp/default.nix | 4 +- .../networking/browsers/librewolf/default.nix | 4 +- .../browsers/librewolf/librewolf.nix | 2 +- .../networking/browsers/librewolf/src.json | 10 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/argocd/default.nix | 4 +- .../cluster/helm/plugins/helm-secrets.nix | 4 +- .../networking/cluster/helmfile/default.nix | 6 +- .../networking/cluster/istioctl/default.nix | 6 +- .../networking/cluster/k0sctl/default.nix | 11 +- .../cluster/kube-router/default.nix | 4 +- .../networking/cluster/kubedb-cli/default.nix | 4 +- .../networking/cluster/stern/default.nix | 39 - .../terraform-providers/providers.json | 6 +- .../networking/cluster/terranix/default.nix | 4 +- .../networking/dnscontrol/default.nix | 6 +- .../networking/feedreaders/russ/default.nix | 37 - .../networking/firewalld/default.nix | 4 +- .../signal-desktop/signal-desktop-beta.nix | 4 +- .../signalbackup-tools/default.nix | 4 +- .../networking/irc/epic5/default.nix | 41 - .../thunderbird-bin/release_sources.nix | 530 +- .../networking/nextcloud-client/default.nix | 2 + .../networking/p2p/vuze/default.nix | 3 + .../networking/powerdns-admin/default.nix | 1 + .../networking/protonvpn-gui/default.nix | 22 +- .../networking/pyload-ng/default.nix | 36 +- .../networking/remote/xrdp/default.nix | 21 +- .../remote/xrdp/dynamic_config.patch | 80 +- .../networking/sniffers/sngrep/default.nix | 1 + .../applications/office/appflowy/default.nix | 6 +- .../applications/printing/pappl/default.nix | 63 - .../pkgs/applications/radio/xlog/default.nix | 4 +- .../science/biology/diamond/default.nix | 4 +- .../science/biology/last/default.nix | 4 +- .../science/chemistry/nwchem/default.nix | 4 +- .../science/math/polymake/default.nix | 4 +- .../science/physics/crystfel/default.nix | 7 +- .../physics/crystfel/gui-path-issue.patch | 27 - .../science/physics/sherpa/default.nix | 8 +- .../science/robotics/mavproxy/default.nix | 28 +- .../terminal-emulators/wezterm/default.nix | 45 +- .../git-branchless/default.nix | 18 +- .../version-management/git-extras/default.nix | 4 +- .../applications/video/clapper/default.nix | 4 + .../applications/video/dra-cla/default.nix | 44 +- .../applications/video/mapmap/default.nix | 2 +- .../applications/video/obs-studio/default.nix | 2 + .../plugins/obs-multi-rtmp/default.nix | 11 +- .../obs-studio/plugins/obs-source-record.nix | 4 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/crosvm/default.nix | 19 +- .../virtualization/crosvm/update.py | 5 +- .../virtualization/podman-desktop/default.nix | 76 +- .../extension-no-download-podman.patch | 31 +- .../patches/fix-yarn-lock-deterministic.patch | 13 - .../virtualization/qemu/default.nix | 4 +- .../virtualization/virt-what/default.nix | 4 +- .../virtualization/virtualbox/default.nix | 287 +- .../virtualization/virtualbox/extpack.nix | 18 +- .../guest-additions-iso/default.nix | 16 +- .../virtualbox/guest-additions/builder.nix | 152 +- .../virtualbox/guest-additions/default.nix | 209 +- .../vmware-workstation/default.nix | 108 +- .../window-managers/leftwm/default.nix | 15 +- .../window-managers/weston/default.nix | 4 +- .../node/import-npm-lock/default.nix | 8 +- .../setup-hooks/mpi-check-hook/default.nix | 4 + .../mpi-check-hook/mpi-check-hook.sh | 11 + .../setup-hooks/mpi-check-hook/topology.xml | 10 + .../substitute/substitute-all.nix | 32 +- .../pkgs/build-support/xen/default.nix | 5 +- .../pkgs/by-name/al/albedo/package.nix | 33 + .../pkgs/by-name/al/aldente/package.nix | 4 +- .../pkgs/by-name/al/alioth/package.nix | 36 + .../pkgs/by-name/an/ananicy-cpp/package.nix | 2 + .../an/ananicy-cpp/reliable-mounts-file.patch | 13 + .../pkgs/by-name/an/anchor/package.nix | 2 +- .../pkgs/by-name/an/ani-skip/package.nix | 55 + .../pkgs/by-name/an/antares/npm-lock.patch | 30033 +++++++++++----- .../pkgs/by-name/an/antares/package.nix | 31 +- .../nixpkgs/pkgs/by-name/an/anyk/package.nix | 17 +- .../by-name/ap/appimageupdate/package.nix | 85 + .../ap/application-title-bar/package.nix | 19 +- .../nixpkgs/pkgs/by-name/ap/apt/package.nix | 4 +- .../pkgs/by-name/ar/archivemount/package.nix | 59 + .../nixpkgs/pkgs/by-name/ar/art/package.nix | 4 +- .../as/astro-language-server/package.nix | 6 +- .../nixpkgs/pkgs/by-name/at/atlas/package.nix | 19 +- .../by-name/au/audiobookshelf/source.json | 10 +- .../pkgs/by-name/au/auto-cpufreq/package.nix | 2 +- .../pkgs/by-name/au/autoprefixer/package.nix | 2 +- .../nixpkgs/pkgs/by-name/aw/await/package.nix | 12 +- .../pkgs/by-name/aw/awscli2/package.nix | 6 + .../ay/ayatana-indicator-messages/package.nix | 6 +- .../pkgs/by-name/ba/basalt-monado/package.nix | 78 + .../ba/bash-language-server/package.nix | 8 +- .../pkgs/by-name/ba/bazecor/package.nix | 4 +- .../be/bear/0001-exclude-tests-from-all.patch | 25 + .../be/bear/package.nix} | 63 +- .../pkgs/by-name/bi/binsider/package.nix | 27 +- .../pkgs/by-name/bi/bitcomet/package.nix | 43 + .../pkgs/by-name/bi/bitmagnet/package.nix | 4 +- .../by-name/bl/blueprint-compiler/package.nix | 4 +- .../bl}/bluespec/libstp_stub_makefile.patch | 0 .../bl/bluespec/package.nix} | 4 +- .../pkgs/by-name/bu/bustools/package.nix | 44 + .../pkgs/by-name/ca/cabal-cli/package.nix | 33 + .../ca}/calibre/dont_build_unrar_plugin.patch | 0 .../ca/calibre/package.nix} | 110 +- .../pkgs/by-name/ca/cargo-expand/package.nix | 6 +- .../ca/cargo-hakari/package.nix} | 13 +- .../by-name/ca/catppuccin-cursors/package.nix | 4 +- .../ca/catppuccin-whiskers/package.nix | 6 +- .../pkgs/by-name/ch/charmcraft/package.nix | 4 +- .../pkgs/by-name/cl/clang-uml/package.nix | 67 +- .../pkgs/by-name/cl/clash-verge-rev/webui.nix | 2 +- .../co/connman/create-libppp-compat.h.patch | 132 - .../pkgs/by-name/co/connman/package.nix | 10 +- .../pkgs/by-name/co/containerlab/package.nix | 15 +- .../co/copilot-node-server/package-lock.json | 16 + .../co/copilot-node-server/package.nix | 42 + .../by-name/co/cosmic-wallpapers/package.nix | 49 + .../by-name/co/couchbase-shell/package.nix | 52 + .../pkgs/by-name/cr/crabfit-api/package.nix | 4 +- .../by-name/cr/crabfit-frontend/package.nix | 4 +- .../pkgs/by-name/cs/csvlens/package.nix | 6 +- .../cu/cups-brother-hl3170cdw/package.nix | 111 + .../pkgs/by-name/cy/cyrus-imapd/package.nix | 204 + .../pkgs/by-name/da/dataexplorer/package.nix | 10 +- .../pkgs/by-name/db/dbeaver-bin/package.nix | 3 - .../pkgs/by-name/db/dbip-asn-lite/package.nix | 35 + .../by-name/db/dbip-city-lite/package.nix | 35 + .../db/dbip-country-lite/package.nix} | 16 +- .../nixpkgs/pkgs/by-name/de/deno/package.nix | 6 +- .../by-name/de/dependency-track/package.nix | 17 +- .../nixpkgs/pkgs/by-name/de/desed/package.nix | 17 +- ...-remove-hard-coded-paths-in-xoptions.patch | 44 + .../by-name/de/detect-it-easy/package.nix | 68 + .../pkgs/by-name/di/displaycal/package.nix | 11 +- .../pkgs/by-name/dn/dnsdiag/package.nix | 40 + .../pkgs/by-name/dn/dnslookup/package.nix | 28 + .../nixpkgs/pkgs/by-name/du/dut/package.nix | 33 + .../ed}/eduke32/convert-bmp-to-png.diff | 0 .../pkgs/by-name/ed/eduke32/package.nix | 195 + .../pkgs/by-name/ek/eksctl/package.nix | 4 +- .../pkgs/by-name/en/en-croissant/package.nix | 2 +- .../pkgs/by-name/en/envision/package.nix | 19 +- .../0001-nixpkgs-use-system-Python.patch | 23 +- .../en/envoy/0002-nixpkgs-use-system-Go.patch | 30 +- ...03-nixpkgs-use-system-C-C-toolchains.patch | 11 +- .../by-name/en/envoy/bazel_nix.BUILD.bazel | 54 + .../nixpkgs/pkgs/by-name/en/envoy/package.nix | 58 +- .../by-name/en/envoy/rules_rust_extra.patch | 18 + .../nixpkgs/pkgs/by-name/ep/epic5/package.nix | 51 + .../eq/equibop/disable_update_checking.patch | 16 + .../pkgs/by-name/eq/equibop/package.nix | 153 + .../eq/equibop/use_system_equicord.patch | 17 + .../pkgs/by-name/eq/equicord/package.nix | 63 + .../pkgs/by-name/er/errands/package.nix | 4 +- .../pkgs/by-name/es/espflash/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ex/exo/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ez/eza/package.nix | 6 +- .../{games => by-name/fa}/factorio/mods.nix | 0 .../pkgs/by-name/fa/factorio/package.nix | 310 + .../pkgs/by-name/fa/factorio/update.py | 289 + .../{games => by-name/fa}/factorio/utils.nix | 0 .../pkgs/by-name/fa/factorio/versions.json | 102 + .../nixpkgs/pkgs/by-name/fc/fceux/package.nix | 75 + .../fc/fcitx5-pinyin-moegirl/package.nix | 4 +- .../pkgs/by-name/fd/fdroidserver/package.nix | 5 +- .../pkgs/by-name/fe/feishin/package.nix | 8 +- .../pkgs/by-name/fi/fireplace/package.nix | 2 + .../pkgs/by-name/fl/flexget/package.nix | 4 +- .../nixpkgs/pkgs/by-name/fo/folio/package.nix | 4 +- .../pkgs/by-name/fo/follow/package.nix | 2 +- .../pkgs/by-name/fo/foxmarks/package.nix | 30 + .../0003-freecad-font-issue-10514.patch | 61 + .../pkgs/by-name/fr/freecad/package.nix | 1 + .../by-name/fr/frog-protocols/package.nix | 43 + .../pkgs/by-name/fu/furnace/package.nix | 4 +- .../pkgs/by-name/ge/gersemi/package.nix | 4 +- .../pkgs/by-name/gi/git-prole/package.nix | 6 +- .../pkgs/by-name/gi/git-spice/package.nix | 25 +- .../pkgs/by-name/gi/gitbutler/package.nix | 2 +- .../by-name/gi/gitlab-release-cli/package.nix | 4 +- .../pkgs/by-name/gi/gitxray/package.nix | 7 +- .../by-name/gl/glycin-loaders/package.nix | 33 +- .../nixpkgs/pkgs/by-name/gm/gmrun/package.nix | 48 + .../by-name/gn/gnome-commander/package.nix | 78 + .../pkgs/by-name/go/godot_4/package.nix | 6 +- .../pkgs/by-name/go/goofcord/package.nix | 2 +- .../pkgs/by-name/go/goose-lang/package.nix | 33 + .../pkgs/by-name/gp/gpclient/package.nix | 13 +- .../pkgs/by-name/gp/gpscorrelate/package.nix | 9 +- .../pkgs/by-name/gp/gpt4all/package.nix | 13 +- .../pkgs/by-name/gr/gramma/package.json | 84 - .../pkgs/by-name/gr/gramma/package.nix | 32 +- .../pkgs/by-name/gr/granted/package.nix | 40 +- .../pkgs/by-name/gr/graphpython/package.nix | 45 + .../pkgs/by-name/gt/gtuber/package.nix | 56 + .../pkgs/by-name/gu/gucharmap/package.nix | 4 +- .../pkgs/by-name/gw/gweled/package.nix | 51 + .../pkgs/by-name/gz/gzdoom/package.nix | 4 +- .../nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock | 95 +- .../pkgs/by-name/ha/halloy/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ha/halo/package.nix | 4 +- .../pkgs/by-name/ha/handlr-regex/package.nix | 19 +- .../pkgs/by-name/ha/harlequin/package.nix | 4 +- .../pkgs/by-name/ha/hashes/package.nix | 73 + .../nixpkgs/pkgs/by-name/hi/highs/package.nix | 4 +- .../pkgs/by-name/ho/home-manager/package.nix | 6 +- .../pkgs/by-name/ho/homebox/package.nix | 2 +- .../by-name/ht/httpie-desktop/package.nix | 21 +- .../pkgs/by-name/hy/hyprdim/package.nix | 6 +- .../pkgs/by-name/hy/hypridle/package.nix | 36 +- .../pkgs/by-name/hy/hyprlock/package.nix | 8 +- .../pkgs/by-name/ic/ice-bar/package.nix | 4 +- .../nixpkgs/pkgs/by-name/im/imhex/package.nix | 105 +- .../pkgs/by-name/im/immich-go/package.nix | 4 +- .../pkgs/by-name/im/immich/sources.json | 20 +- .../pkgs/by-name/in/inspector/package.nix | 67 + .../is/isc-cron/0000-nixpkgs-specific.diff | 4 +- .../pkgs/by-name/is/isc-cron/package.nix | 4 +- .../pkgs/by-name/jo/joe/macos-fix.patch | 13 + .../nixpkgs/pkgs/by-name/jo/joe/package.nix | 2 + .../pkgs/by-name/ju/junest/package.nix | 4 +- .../nixpkgs/pkgs/by-name/ka/kamp/package.nix | 32 + .../pkgs/by-name/ka/kanidm/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ka/kara/package.nix | 4 +- .../pkgs/by-name/kc/kclvm_cli/package.nix | 6 +- .../pkgs/by-name/ke/keymapp/package.nix | 4 +- .../ki/kid3/package.nix} | 134 +- .../pkgs/by-name/ki/kiwitalk/Cargo.lock | 5804 --- .../pkgs/by-name/ki/kiwitalk/package.nix | 79 - .../nixpkgs/pkgs/by-name/ko/komac/package.nix | 70 +- .../ku/kubent/package.nix} | 26 +- .../by-name/la/labwc-tweaks-gtk/package.nix | 6 +- .../la/lazpaint/package.nix} | 65 +- .../pkgs/by-name/le/legcord/package.nix | 2 +- .../li/libguestfs-appliance/package.nix} | 22 +- .../li/libguestfs-with-appliance/package.nix | 12 + ...ss-CFLAGS-through-extra_linker_flags.patch | 17 + .../li}/libguestfs/libguestfs-syms.patch | 0 .../pkgs/by-name/li/libguestfs/package.nix | 201 + .../fix-library-resolving.patch} | 77 +- .../libnvidia-container/inline-c-struct.patch | 0 .../li}/libnvidia-container/modprobe.patch | 17 +- .../li/libnvidia-container/package.nix} | 85 +- .../pkgs/by-name/li/litmusctl/package.nix | 4 +- .../pkgs/by-name/li/live-chart/package.nix | 50 + .../pkgs/by-name/li/live555/package.nix | 6 +- .../pkgs/by-name/lo/logseq/package.nix | 53 +- .../lu/luaformatter/fix-lib-paths.patch | 2 +- .../pkgs/by-name/lu/luaformatter/package.nix | 3 +- .../pkgs/by-name/lu/lug-helper/package.nix | 7 +- .../pkgs/by-name/ma/maa-cli/package.nix | 6 +- .../pkgs/by-name/ma/mactop/package.nix | 4 +- .../pkgs/by-name/ma/mapserver/package.nix | 29 +- .../pkgs/by-name/md/md-tui/package.nix | 6 +- .../me/merge-ut-dictionaries/package.nix | 6 +- .../pkgs/by-name/me/metacubexd/package.nix | 6 +- .../mi/mimir/package.nix} | 12 +- .../nixpkgs/pkgs/by-name/mi/miru/darwin.nix | 2 +- .../nixpkgs/pkgs/by-name/mi/miru/linux.nix | 2 +- .../nixpkgs/pkgs/by-name/mi/miru/package.nix | 2 +- .../by-name/mi/misconfig-mapper/package.nix | 6 +- .../pkgs/by-name/mi/misskey/package.nix | 2 +- .../nixpkgs/pkgs/by-name/mi/mixxc/package.nix | 6 +- .../pkgs/by-name/mo/moonlight-qt/package.nix | 38 +- .../nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock | 2 +- .../nixpkgs/pkgs/by-name/mo/motoc/package.nix | 4 +- .../pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +- .../mo/mozcdic-ut-alt-cannadic/package.nix | 6 +- .../by-name/mo/mozcdic-ut-edict2/package.nix | 6 +- .../by-name/mo/mozcdic-ut-jawiki/package.nix | 6 +- .../by-name/mo/mozcdic-ut-neologd/package.nix | 6 +- .../mo/mozcdic-ut-personal-names/package.nix | 6 +- .../mo/mozcdic-ut-place-names/package.nix | 6 +- .../mo/mozcdic-ut-skk-jisyo/package.nix | 6 +- .../mo/mozcdic-ut-sudachidict/package.nix | 6 +- .../pkgs/by-name/mo/mozillavpn/package.nix | 19 +- .../pkgs/by-name/ms/msolve/package.nix | 27 +- .../nixpkgs/pkgs/by-name/n8/n8n/package.nix | 2 +- .../pkgs/by-name/ne/netbeans/package.nix | 46 +- .../nextcloud-whiteboard-server/package.nix | 35 + .../nixos-firewall-tool.sh | 38 +- .../ni/nixos-firewall-tool/package.nix | 8 +- .../pkgs/by-name/ns/nstool/package.nix | 4 +- .../nixpkgs/pkgs/by-name/nv/nvrh/package.nix | 4 +- .../pkgs/by-name/ob/obs-cmd/package.nix | 6 +- .../nixpkgs/pkgs/by-name/od/odin/package.nix | 6 +- .../pkgs/by-name/oh/oh-my-fish/omf-install | 4 +- .../pkgs/by-name/oh/oh-my-fish/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ol/ols/package.nix | 6 +- .../pkgs/by-name/op/opencomposite/package.nix | 8 +- .../pkgs/by-name/op/opengist/package.nix | 40 +- .../by-name/op/openpgp-card-tools/package.nix | 9 +- .../pkgs/by-name/op/openvmm/Cargo.lock | 8750 +++++ .../pkgs/by-name/op/openvmm/package.nix | 57 + .../pkgs/by-name/os/oscavmgr/Cargo.lock | 134 +- .../pkgs/by-name/os/oscavmgr/package.nix | 6 +- .../pkgs/by-name/ou/outguess/package.nix | 13 +- .../pkgs/by-name/ov/overlayed/webui.nix | 2 +- .../nixpkgs/pkgs/by-name/ov/ovn/package.nix | 4 +- .../nixpkgs/pkgs/by-name/pa/pacu/package.nix | 1 + .../pkgs/by-name/pa/paper-clip/package.nix | 4 +- .../nixpkgs/pkgs/by-name/pa/pappl/package.nix | 74 + .../pkgs/by-name/pa/patch2pr/package.nix | 6 +- .../pa/patroni/package.nix} | 19 +- .../pkgs/by-name/pc/pcsx2-bin/package.nix | 4 +- .../pkgs/by-name/pd/pdftitle/package.nix | 4 +- .../pe/petsc/filter_mpi_warnings.patch | 112 - .../nixpkgs/pkgs/by-name/pe/petsc/package.nix | 8 +- .../nixpkgs/pkgs/by-name/pg/pgrok/package.nix | 2 +- .../nixpkgs/pkgs/by-name/pi/pipet/package.nix | 4 +- .../nixpkgs/pkgs/by-name/pk/pkarr/package.nix | 36 + .../pl/plasma-panel-colorizer/package.nix | 18 +- .../pkgs/by-name/po/pocketsphinx/package.nix | 66 + .../pkgs/by-name/po/podman-tui/package.nix | 4 +- .../pkgs/by-name/po/portfolio/package.nix | 3 - .../pkgs/by-name/pr/pretalx/package.nix | 17 +- .../by-name/pr/pretalx/plugins/downstream.nix | 4 +- .../pr/pretalx/plugins/media-ccc-de.nix | 4 +- .../pkgs/by-name/pr/pretalx/plugins/pages.nix | 4 +- .../pr/pretalx/plugins/public-voting.nix | 4 +- .../by-name/pr/pretalx/plugins/venueless.nix | 4 +- .../pkgs/by-name/pr/pretalx/plugins/vimeo.nix | 4 +- .../by-name/pr/pretalx/plugins/youtube.nix | 4 +- .../pkgs/by-name/pr/pretix/package.nix | 1 + .../prettier-plugin-go-template/package.nix | 11 +- .../pkgs/by-name/pr/prisma/package.nix | 6 +- .../pr/prismlauncher-unwrapped/package.nix | 15 +- .../pkgs/by-name/pu/pulsar/package.nix | 6 +- .../pkgs/by-name/pu/pupdate/package.nix | 4 +- .../nixpkgs/pkgs/by-name/py/pyfa/package.nix | 31 + .../pkgs/by-name/py/pylyzer/Cargo.lock | 44 +- .../pkgs/by-name/py/pylyzer/package.nix | 4 +- .../nixpkgs/pkgs/by-name/qc/qcm/package.nix | 31 +- .../by-name/ra/raspberrypi-eeprom/package.nix | 2 + .../pkgs/by-name/re/reader/package.nix | 30 + .../nixpkgs/pkgs/by-name/re/reco/package.nix | 57 + .../pkgs/by-name/re/release-plz/package.nix | 9 +- .../pkgs/by-name/re/remind/package.nix | 6 +- .../pkgs/by-name/re/renovate/package.nix | 2 +- .../nixpkgs/pkgs/by-name/re/renpy/5687.patch | 91 + .../nixpkgs/pkgs/by-name/re/renpy/package.nix | 6 +- .../by-name/ri/river-bsp-layout/package.nix | 28 + .../nixpkgs/pkgs/by-name/ro/rospo/package.nix | 6 +- .../pkgs/by-name/rs/rsshub/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ru/russ/package.nix | 41 + .../pkgs/by-name/ru/rustic/package.nix | 11 +- .../nixpkgs/pkgs/by-name/ry/rye/Cargo.lock | 2 +- .../nixpkgs/pkgs/by-name/ry/rye/package.nix | 15 +- .../pkgs/by-name/ry/ryokucha/package.nix | 46 + .../pkgs/by-name/sa/sarasa-gothic/package.nix | 4 +- .../nixpkgs/pkgs/by-name/se/seq-cli/deps.nix | 23 + .../pkgs/by-name/se/seq-cli/package.nix | 42 + .../pkgs/by-name/sh/shanggu-fonts/package.nix | 15 +- .../pkgs/by-name/sh/shpool/package.nix | 6 +- .../pkgs/by-name/si/simpleini/package.nix | 53 + .../pkgs/by-name/si/sioyek/package.nix | 25 +- .../pkgs/by-name/si/siyuan/package.nix | 2 +- .../sk/sketchybar-app-font/package.nix | 2 +- .../pkgs/by-name/sk/skypeforlinux/package.nix | 6 +- .../pkgs/by-name/sn/snipaste/package.nix | 11 +- .../pkgs/by-name/sn/snipaste/update.sh | 15 + .../nixpkgs/pkgs/by-name/sn/snoop/package.nix | 74 + .../pkgs/by-name/sp/spacectl/package.nix | 4 +- .../by-name/sp/speakersafetyd/package.nix | 6 +- .../pkgs/by-name/sp/spirit/package.nix | 16 +- .../nixpkgs/pkgs/by-name/sr/srgn/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ss/sscep/package.nix | 40 + .../pkgs/by-name/ss/ssh-tpm-agent/package.nix | 9 +- .../pkgs/by-name/st/stackql/package.nix | 6 +- .../pkgs/by-name/st/stalwart-mail/package.nix | 6 +- .../pkgs/by-name/st/step-cli/package.nix | 6 +- .../nixpkgs/pkgs/by-name/st/stern/package.nix | 61 + .../nixpkgs/pkgs/by-name/st/sttr/package.nix | 6 +- .../pkgs/by-name/st/stylelint-lsp/package.nix | 15 +- .../pkgs/by-name/su/surrealist/package.nix | 2 +- .../pkgs/by-name/sv/svdtools/package.nix | 6 +- .../pkgs/by-name/sv/svix-server/Cargo.lock | 20 +- .../pkgs/by-name/sv/svix-server/package.nix | 4 +- .../pkgs/by-name/sw/swayimg/package.nix | 62 +- .../pkgs/by-name/sw/swt/awt-libs.patch | 8 - .../pkgs/by-name/sw/swt/gtk-libs.patch | 14 - .../nixpkgs/pkgs/by-name/sw/swt/package.nix | 109 +- .../pkgs/by-name/sy/syncstorage-rs/Cargo.lock | 705 +- .../by-name/sy/syncstorage-rs/package.nix | 4 +- .../pkgs/by-name/sy/syncyomi/package.nix | 2 +- .../pkgs/by-name/sy/system76-power/Cargo.lock | 1774 + .../by-name/sy/system76-power/package.nix | 13 +- .../by-name/sy/system76-scheduler/package.nix | 6 +- ...ild-use-nix-native-llama-cpp-package.patch | 29 - .../nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock | 3704 +- .../nixpkgs/pkgs/by-name/ta/tabby/package.nix | 204 +- .../ta/tailscale/package.nix} | 8 +- .../by-name/ta/taler-wallet-core/package.nix | 2 +- .../by-name/ta/taterclient-ddnet/package.nix | 136 + .../nixpkgs/pkgs/by-name/td/tdf/Cargo.lock | 1589 +- .../nixpkgs/pkgs/by-name/td/tdf/package.nix | 12 +- .../te/technitium-dns-server/package.nix | 10 +- .../pkgs/by-name/te/termineter/package.nix | 41 + .../pkgs/by-name/te/tex-fmt/package.nix | 6 +- .../pkgs/by-name/th/thrift-ls/package.nix | 4 +- .../pkgs/by-name/ti/tinymist/Cargo.lock | 1279 +- .../pkgs/by-name/ti/tinymist/package.nix | 16 +- .../pkgs/by-name/tl/tlsinfo/package.nix | 33 + .../pkgs/by-name/to/tocpdf/package.nix | 24 +- .../pkgs/by-name/to/tootik/package.nix | 6 +- .../pkgs/by-name/tr/tradingview/package.nix | 6 +- .../pkgs/by-name/tr/trickest-cli/package.nix | 4 +- .../tu/turbo-unwrapped/enable-lazy_cell.patch | 12 - .../by-name/tu/turbo-unwrapped/package.nix | 13 +- .../pkgs/by-name/tu/tuxguitar/package.nix | 69 + .../nixpkgs/pkgs/by-name/ty/typst/Cargo.lock | 1431 +- .../nixpkgs/pkgs/by-name/ty/typst/package.nix | 63 +- .../pkgs/by-name/ty/typstyle/Cargo.lock | 2230 +- .../pkgs/by-name/ty/typstyle/package.nix | 11 +- .../nixpkgs/pkgs/by-name/ui/uiua/package.nix | 8 +- .../nixpkgs/pkgs/by-name/uv/uv/Cargo.lock | 346 +- .../nixpkgs/pkgs/by-name/uv/uv/package.nix | 9 +- .../pkgs/by-name/va/valuta/package.nix | 5 +- .../pkgs/by-name/ve/vencord/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ve/veryl/package.nix | 16 +- .../pkgs/by-name/ve/vesktop/package.nix | 2 +- .../pkgs/by-name/vi/vikunja/package.nix | 2 +- .../pkgs/by-name/vi/virt-v2v/package.nix | 106 + .../vi/vivictpp/package.nix} | 12 +- .../nixpkgs/pkgs/by-name/vt/vt323/package.nix | 31 + .../vy/vym/package.nix} | 54 +- .../vy/vym/patches/0000-fix-zip-paths.diff} | 0 .../by-name/wa/warp-terminal/versions.json | 12 +- .../pkgs/by-name/wa/waveterm/package.nix | 10 +- .../pkgs/by-name/wa/waveterm/update.sh | 5 +- .../wa/waycorner/package.nix} | 36 +- .../pkgs/by-name/we/weblate/package.nix | 8 +- .../pkgs/by-name/wh/whatsie/package.nix | 4 +- .../pkgs/by-name/wi/windmill/Cargo.lock | 4687 ++- .../pkgs/by-name/wi/windmill/package.nix | 99 +- .../nixpkgs/pkgs/by-name/wi/wivrn/package.nix | 149 + .../pkgs/by-name/wr/wrangler/package.nix | 2 +- .../wr/writefreely/package.nix} | 25 +- .../pkgs/by-name/x5/x509-limbo/package.nix | 48 - .../xc/xchm/package.nix} | 4 +- .../nixpkgs/pkgs/by-name/xe/xeol/package.nix | 4 +- .../by-name/xw/xwayland-satellite/package.nix | 81 +- .../pkgs/by-name/ya/yara-x/package.nix | 6 +- .../pkgs/by-name/yg/yggdrasil/package.nix | 6 +- .../pkgs/by-name/yo/youtrack/package.nix | 4 +- .../pkgs/by-name/yt/yt-dlp/package.nix | 4 +- .../nixpkgs/pkgs/by-name/yu/yutto/package.nix | 5 +- .../pkgs/by-name/ze/zenn-cli/package.nix | 2 +- .../pkgs/by-name/zs/zsh-wd/package.nix | 4 +- .../pkgs/by-name/zs/zsync2/package.nix | 66 + .../pkgs/by-name/zz/zziplib/package.nix | 4 +- .../nixpkgs/pkgs/data/fonts/iosevka/comfy.nix | 10 +- .../pkgs/data/fonts/julia-mono/default.nix | 4 +- .../pkgs/data/misc/clash-geoip/default.nix | 32 - .../unicode-character-database/default.nix | 4 +- .../themes/catppuccin-kvantum/default.nix | 27 +- .../gnome/extensions/extensionOverrides.nix | 2 +- .../pkgs/desktops/mate/mate-panel/default.nix | 6 +- .../xfce/applications/mousepad/default.nix | 14 +- .../beam-modules/elixir-ls/default.nix | 5 +- .../development/compilers/fasmg/default.nix | 4 +- .../development/compilers/flix/default.nix | 4 +- .../development/compilers/halide/default.nix | 163 +- .../development/compilers/idris2/default.nix | 2 + .../development/compilers/idris2/pack.nix | 55 + .../development/compilers/zig/generic.nix | 8 +- .../cuda-modules/tensorrt/releases.nix | 2 +- .../configuration-hackage2nix/main.yaml | 5 + .../haskell-modules/hackage-packages.nix | 4 + .../development/interpreters/erlang/25.nix | 4 +- .../development/interpreters/erlang/26.nix | 4 +- .../development/interpreters/erlang/27.nix | 4 +- .../interpreters/erlang/generic-builder.nix | 2 + .../development/interpreters/gauche/boot.nix | 21 +- .../development/interpreters/rakudo/zef.nix | 4 +- .../interpreters/risor/default.nix | 6 +- .../development/interpreters/ruby/default.nix | 5 + .../pkgs/development/interpreters/tcl/9.0.nix | 16 + .../development/interpreters/tcl/generic.nix | 26 +- .../interpreters/wasmer/default.nix | 11 +- .../development/java-modules/jna/default.nix | 4 +- .../development/libraries/bwidget/default.nix | 4 +- .../development/libraries/dclib/default.nix | 4 +- .../development/libraries/fftw/default.nix | 2 + .../libraries/gbenchmark/default.nix | 2 +- .../development/libraries/icu/default.nix | 4 + .../development/libraries/icu/make-icu.nix | 10 +- .../development/libraries/imgui/default.nix | 6 +- .../development/libraries/kerberos/krb5.nix | 4 + .../libraries/level-zero/default.nix | 5 +- .../development/libraries/libexif/default.nix | 2 +- .../libraries/libguestfs/default.nix | 168 - .../development/libraries/libjcat/default.nix | 4 +- .../libraries/libjodycode/default.nix | 1 + .../libraries/libmodbus/default.nix | 4 +- .../libraries/libportal/default.nix | 99 +- ...-mobile-broadband-provider-info-path.patch | 4 +- .../libraries/libqofono/default.nix | 2 +- .../libraries/libressl/default.nix | 5 + .../libraries/libspatialite/default.nix | 9 +- .../libspatialite/xmlNanoHTTPCleanup.patch | 26 + .../libraries/libthreadar/default.nix | 4 +- .../development/libraries/libzip/default.nix | 14 +- .../pkgs/development/libraries/mbedtls/3.nix | 4 +- .../physics/fastnlo-toolkit/default.nix | 5 + .../fastnlo-toolkit/yoda2_support.patch | 247 + .../libraries/physics/rivet/default.nix | 54 +- .../libraries/physics/thepeg/default.nix | 15 +- .../libraries/physics/yoda/default.nix | 14 +- .../development/libraries/protobuf/3.20.nix | 6 - .../libraries/protobuf/generic-v3.nix | 59 - .../libraries/qtpbfimageplugin/default.nix | 4 +- .../libraries/quantlib/default.nix | 9 +- .../development/libraries/rdkafka/default.nix | 6 +- .../libraries/sdbus-cpp/default.nix | 108 +- .../pkgs/development/libraries/tk/9.0.nix | 23 + .../pkgs/development/libraries/tk/generic.nix | 25 +- .../webrtc-audio-processing/default.nix | 7 +- .../import/repository/quicklisp.lisp | 18 + .../development/lisp-modules/imported.nix | 8996 ++--- .../pkgs/development/lisp-modules/nix-cl.nix | 14 +- .../development/lisp-modules/packages.nix | 293 +- .../lisp-modules/patches/cephes-make.patch | 33 +- .../kons-9-fix-testsuite-compilation.patch | 22 + .../magicl-dont-build-fortran-twice.patch | 21 - .../pkgs/development/lisp-modules/ql.nix | 3 + .../development/node-packages/aliases.nix | 4 + .../node-packages/node-packages.json | 4 - .../node-packages/node-packages.nix | 587 - .../asn1-combinators/default.nix | 12 +- .../development/ocaml-modules/awa/default.nix | 15 +- .../development/ocaml-modules/awa/mirage.nix | 2 - .../ocaml-modules/ca-certs-nss/default.nix | 6 +- .../ocaml-modules/ca-certs/default.nix | 6 +- .../ocaml-modules/chacha/default.nix | 4 +- .../ocaml-modules/conduit/async.nix | 7 +- .../ocaml-modules/conduit/default.nix | 10 +- .../ocaml-modules/conduit/lwt-unix.nix | 3 +- .../development/ocaml-modules/conduit/lwt.nix | 4 +- .../ocaml-modules/conduit/mirage.nix | 8 +- .../development/ocaml-modules/dns/certify.nix | 8 +- .../development/ocaml-modules/dns/cli.nix | 5 +- .../ocaml-modules/dns/client-lwt.nix | 4 +- .../ocaml-modules/dns/client-mirage.nix | 4 +- .../development/ocaml-modules/dns/default.nix | 10 +- .../development/ocaml-modules/dns/dnssec.nix | 3 - .../development/ocaml-modules/dns/mirage.nix | 1 - .../ocaml-modules/dns/resolver.nix | 1 - .../development/ocaml-modules/dns/server.nix | 1 - .../development/ocaml-modules/dns/stub.nix | 5 +- .../development/ocaml-modules/dns/tsig.nix | 5 +- .../ocaml-modules/erm_xmpp/default.nix | 10 +- .../development/ocaml-modules/git/default.nix | 8 +- .../development/ocaml-modules/git/paf.nix | 2 - .../development/ocaml-modules/git/unix.nix | 16 +- .../ocaml-modules/hkdf/default.nix | 13 +- .../http-mirage-client/default.nix | 4 +- .../ocaml-modules/janestreet/0.15.nix | 2 +- .../ocaml-modules/janestreet/0.16.nix | 2 +- .../ocaml-modules/janestreet/0.17.nix | 1 + .../ocaml-modules/letsencrypt/app.nix | 3 - .../ocaml-modules/letsencrypt/default.nix | 15 +- .../ocaml-modules/letsencrypt/dns.nix | 1 - .../ocaml-modules/letsencrypt/mirage.nix | 2 - .../ocaml-modules/mirage-crypto/default.nix | 16 +- .../ocaml-modules/mirage-crypto/ec.nix | 10 +- .../ocaml-modules/mirage-crypto/pk.nix | 14 +- .../mirage-crypto/rng-mirage.nix | 8 +- .../ocaml-modules/mirage-crypto/rng.nix | 10 +- .../ocaml-modules/mrmime/default.nix | 3 +- .../ocaml-modules/ohex/default.nix | 25 + .../ocaml-modules/opium/default.nix | 2 +- .../development/ocaml-modules/otr/default.nix | 3 +- .../development/ocaml-modules/paf/default.nix | 4 +- .../ocaml-modules/pbkdf/default.nix | 13 +- .../ocaml-modules/randomconv/default.nix | 12 +- .../ocaml-modules/riot/default.nix | 1 + .../ocaml-modules/tcpip/default.nix | 8 +- .../development/ocaml-modules/tls/async.nix | 3 +- .../development/ocaml-modules/tls/default.nix | 10 +- .../development/ocaml-modules/tls/lwt.nix | 3 +- .../development/ocaml-modules/tls/mirage.nix | 3 +- .../ocaml-modules/x509/default.nix | 14 +- .../python-modules/afdko/default.nix | 95 +- .../python-modules/aioairzone/default.nix | 4 +- .../python-modules/aiohomekit/default.nix | 4 +- .../amaranth-boards/default.nix | 30 +- .../python-modules/amaranth-soc/default.nix | 18 +- .../python-modules/amaranth/default.nix | 10 +- .../python-modules/axisregistry/default.nix | 4 +- .../python-modules/biliass/default.nix | 12 +- .../python-modules/brotlipy/default.nix | 36 +- .../python-modules/cachier/default.nix | 12 +- .../python-modules/clarifai-grpc/default.nix | 4 +- .../python-modules/click-aliases/default.nix | 4 +- .../python-modules/clikit/default.nix | 53 +- .../python-modules/cohere/default.nix | 8 +- .../python-modules/crcelk/default.nix | 36 + .../python-modules/cryptg/default.nix | 19 +- .../python-modules/cymruwhois/default.nix | 48 + .../python-modules/dbt-adapters/default.nix | 2 + .../python-modules/dbt-common/default.nix | 5 +- .../python-modules/dbt-core/default.nix | 1 + .../dbt-semantic-interfaces/default.nix | 4 +- .../python-modules/diffenator2/default.nix | 11 +- .../django-js-reverse/default.nix | 5 +- .../django-modeltranslation/default.nix | 4 +- .../django-two-factor-auth/default.nix | 11 +- .../djangorestframework-csv/default.nix | 52 + .../python-modules/dlib/default.nix | 11 +- .../python-modules/dncil/default.nix | 37 + .../python-modules/dragonfly/default.nix | 76 +- .../python-modules/drf-yasg/default.nix | 4 +- .../edk2-pytool-library/default.nix | 6 +- .../python-modules/eq3btsmart/default.nix | 4 +- .../python-modules/equinox/default.nix | 4 +- .../python-modules/fastcore/default.nix | 4 +- .../python-modules/faster-whisper/default.nix | 10 +- .../python-modules/flask-mail/default.nix | 7 + .../python-modules/flet/default.nix | 1 + .../python-modules/fontbakery/default.nix | 6 +- .../python-modules/frozendict/default.nix | 4 +- .../python-modules/gcal-sync/default.nix | 4 +- .../python-modules/gflanguages/default.nix | 23 +- .../python-modules/gftools/default.nix | 2 + .../python-modules/gin-config/default.nix | 26 +- .../python-modules/glyphsets/default.nix | 14 +- .../default.nix | 4 +- .../google-cloud-bigquery-storage/default.nix | 4 +- .../google-cloud-container/default.nix | 4 +- .../google-cloud-error-reporting/default.nix | 9 +- .../google-cloud-texttospeech/default.nix | 4 +- .../google-nest-sdm/default.nix | 4 +- .../govee-local-api/default.nix | 4 +- .../python-modules/griffe/default.nix | 4 +- .../python-modules/guidata/default.nix | 96 + .../python-modules/ha-ffmpeg/default.nix | 16 +- .../ha-mqtt-discoverable/default.nix | 4 +- .../python-modules/herepy/default.nix | 4 +- .../python-modules/histoprint/default.nix | 4 +- .../python-modules/hiyapyco/default.nix | 4 +- .../python-modules/holidays/default.nix | 4 +- .../home-assistant-bluetooth/default.nix | 4 +- .../python-modules/httpx-ws/default.nix | 18 +- .../huggingface-hub/default.nix | 4 +- .../python-modules/imgtool/default.nix | 45 - .../python-modules/inflection/default.nix | 5 +- .../influxdb-client/default.nix | 4 +- .../python-modules/insightface/default.nix | 20 +- .../python-modules/js2py/default.nix | 47 - .../python-modules/jupysql/default.nix | 5 +- .../jupyter-console/default.nix | 54 +- .../python-modules/karton-core/default.nix | 4 +- .../python-modules/keras/default.nix | 2 +- .../python-modules/lark/default.nix | 2 +- .../python-modules/lcd-i2c/default.nix | 19 +- .../python-modules/lcov-cobertura/default.nix | 7 +- .../python-modules/libcst/default.nix | 12 +- .../python-modules/libsoundtouch/default.nix | 24 +- .../python-modules/lineax/default.nix | 4 +- .../lm-format-enforcer/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/mkdocstrings/default.nix | 6 +- .../python-modules/monkeytype/default.nix | 58 + .../python-modules/mplhep-data/default.nix | 4 +- .../python-modules/msgraph-sdk/default.nix | 4 +- .../python-modules/nebula3-python/default.nix | 4 +- .../python-modules/nibe/default.nix | 6 +- .../python-modules/nitrokey/default.nix | 4 +- .../python-modules/numpy-stl/default.nix | 25 +- .../open-clip-torch/default.nix | 4 +- .../python-modules/optimistix/default.nix | 4 +- .../python-modules/parselmouth/default.nix | 7 +- .../python-modules/pdoc/default.nix | 12 +- .../python-modules/pesq/default.nix | 77 + .../playwrightcapture/default.nix | 4 +- .../python-modules/plotpy/default.nix | 117 + .../python-modules/plugwise/default.nix | 4 +- .../python-modules/pocketsphinx/default.nix | 57 + .../python-modules/praw/default.nix | 17 +- .../python-modules/proton-core/default.nix | 4 +- .../default.nix | 40 - .../proton-keyring-linux/default.nix | 9 +- .../proton-vpn-api-core/default.nix | 40 +- .../proton-vpn-connection/default.nix | 67 - .../default.nix | 67 - .../default.nix | 61 - .../proton-vpn-killswitch/default.nix | 40 - .../proton-vpn-logger/default.nix | 47 - .../default.nix | 52 - .../default.nix | 57 - .../proton-vpn-network-manager/default.nix | 28 +- .../proton-vpn-session/default.nix | 65 - .../publicsuffixlist/default.nix | 4 +- .../python-modules/pure-protobuf/default.nix | 4 +- .../python-modules/pyais/default.nix | 4 +- .../python-modules/pyblu/default.nix | 6 +- .../python-modules/pycrdt/Cargo.lock | 18 +- .../python-modules/pycrdt/default.nix | 6 +- .../python-modules/pydeps/default.nix | 12 +- .../python-modules/pyexploitdb/default.nix | 4 +- .../python-modules/pygmt/default.nix | 2 +- .../python-modules/pyipp/default.nix | 6 +- .../python-modules/pyjsparser/default.nix | 10 +- .../python-modules/pylutron/default.nix | 4 +- .../python-modules/pyopencl/default.nix | 4 +- .../python-modules/pypoint/default.nix | 6 +- .../python-modules/pysqueezebox/default.nix | 4 +- .../python-modules/pyswitchbot/default.nix | 4 +- .../python-benedict/default.nix | 12 +- .../python-registry/default.nix | 25 +- .../python-roborock/default.nix | 4 +- .../python-modules/pythonqwt/default.nix | 60 + .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyvlx/default.nix | 12 +- .../python-modules/qrcode/default.nix | 37 +- .../python-modules/quamash/default.nix | 48 - .../python-modules/ring-doorbell/default.nix | 4 +- .../python-modules/robotframework/default.nix | 4 +- .../python-modules/sensorpush-ble/default.nix | 21 +- .../sentence-transformers/default.nix | 9 +- .../python-modules/serpent/default.nix | 17 +- .../python-modules/shaperglot/default.nix | 33 +- .../python-modules/sismic/default.nix | 4 +- .../python-modules/smbus2/default.nix | 4 +- .../python-modules/smoke-zephyr/default.nix | 42 + .../python-modules/solarlog-cli/default.nix | 4 +- .../python-modules/sotabenchapi/default.nix | 52 + .../speechrecognition/default.nix | 39 +- .../sphinx-mdinclude/default.nix | 12 +- .../python-modules/spotifyaio/default.nix | 4 +- .../python-modules/submitit/default.nix | 62 + .../python-modules/survey/default.nix | 4 +- .../python-modules/tabula-py/default.nix | 6 +- .../python-modules/tempest/default.nix | 2 + .../tencentcloud-sdk-python/default.nix | 4 +- .../torch-geometric/default.nix | 33 +- ...ropagate-cmakeFlags-from-environment.patch | 29 - .../development/python-modules/torch/bin.nix | 4 +- .../python-modules/torch/binary-hashes.nix | 89 +- .../python-modules/torch/default.nix | 21 +- .../passthrough-python-lib-rel-path.patch | 12 - .../python-modules/torch/prefetch.sh | 7 +- .../python-modules/torchaudio/bin.nix | 4 +- .../torchaudio/binary-hashes.nix | 89 +- .../python-modules/torchaudio/default.nix | 4 +- .../python-modules/torchaudio/prefetch.sh | 7 +- .../python-modules/torchbench/default.nix | 58 + .../python-modules/torchvision/bin.nix | 4 +- .../torchvision/binary-hashes.nix | 89 +- .../python-modules/torchvision/default.nix | 4 +- .../python-modules/torchvision/prefetch.sh | 7 +- .../python-modules/trimesh/default.nix | 4 +- .../development/python-modules/triton/bin.nix | 2 +- .../python-modules/triton/binary-hashes.nix | 31 +- .../python-modules/twilio/default.nix | 4 +- .../types-beautifulsoup4/default.nix | 4 +- .../python-modules/types-html5lib/default.nix | 4 +- .../python-modules/wxpython/4.2.nix | 4 +- .../python-modules/xdg-base-dirs/default.nix | 6 +- .../python-modules/xiaomi-ble/default.nix | 8 +- .../ydata-profiling/default.nix | 4 +- .../pkgs/development/tools/air/default.nix | 6 +- .../pkgs/development/tools/allure/default.nix | 4 +- .../tools/altair-graphql-client/default.nix | 4 +- .../tools/analysis/checkov/default.nix | 4 +- .../tools/analysis/radare2/default.nix | 4 +- .../rizin/0002-disable-pcre2-jit.patch | 36 + .../tools/analysis/rizin/default.nix | 2 + .../tflint-plugins/tflint-ruleset-aws.nix | 6 +- .../bear/fix-functional-tests.patch | 32 - .../pkgs/development/tools/comby/default.nix | 1 - .../buildbot/default.nix | 1 - .../buildbot/master.nix | 22 +- .../buildbot/plugins.nix | 127 +- .../continuous-integration/buildbot/update.sh | 5 - .../buildbot/worker.nix | 3 +- .../buildkite-cli/default.nix | 6 +- .../tools/database/prisma-engines/default.nix | 4 +- .../tools/electron/binary/info.json | 25 +- .../tools/electron/chromedriver/info.json | 25 +- .../pkgs/development/tools/electron/info.json | 38 +- .../pkgs/development/tools/fnlfmt/default.nix | 10 +- .../tools/global-platform-pro/default.nix | 24 +- .../development/tools/go-swag/default.nix | 6 +- .../tools/misc/binutils/default.nix | 23 +- .../tools/misc/binutils/support-ios.patch | 168 - .../tools/misc/opengrok/default.nix | 4 +- .../tools/misc/rustywind/default.nix | 6 +- .../development/tools/mockgen/default.nix | 6 +- .../tools/open-policy-agent/default.nix | 14 +- .../pkgs/development/tools/pnpm/default.nix | 12 +- .../tools/pnpm/fetch-deps/default.nix | 118 +- .../tools/pnpm/fetch-deps/serve.nix | 7 +- .../pkgs/development/tools/pnpm/generic.nix | 76 +- .../development/tools/roswell/default.nix | 4 +- .../tools/rust/cargo-public-api/default.nix | 6 +- .../tools/rust/cargo-sort/default.nix | 6 +- .../pkgs/development/tools/xcodes/default.nix | 4 +- .../tools/xcodes/generated/default.nix | 4 +- .../xcodes/generated/workspace-state.json | 8 +- .../pkgs/development/web/bun/default.nix | 14 +- .../nixpkgs/pkgs/games/corsix-th/default.nix | 10 +- .../nixpkgs/pkgs/games/ddnet/default.nix | 18 +- .../nixpkgs/pkgs/games/eduke32/default.nix | 156 - .../nixpkgs/pkgs/games/factorio/default.nix | 278 - .../nixpkgs/pkgs/games/factorio/update.py | 190 - .../nixpkgs/pkgs/games/factorio/versions.json | 58 - .../nixpkgs/pkgs/games/forge-mtg/default.nix | 29 +- .../nixpkgs/pkgs/games/gshogi/default.nix | 6 + .../nixpkgs/pkgs/games/gweled/default.nix | 35 - .../nixpkgs/pkgs/games/heroic/default.nix | 2 +- .../pkgs/games/hikounomizu/default.nix | 4 +- .../pkgs/kde/generated/sources/plasma.json | 396 +- .../pkgs/kde/misc/kunifiedpush/default.nix | 15 +- .../kde/plasma/plasma-workspace/default.nix | 4 +- .../plasma-workspace/dependency-paths.patch | 4 +- .../misc/screensavers/xlockmore/default.nix | 5 +- .../pkgs/misc/tmux-plugins/default.nix | 15 +- .../os-specific/darwin/bartender/default.nix | 4 +- .../linux/android-udev-rules/default.nix | 4 +- .../os-specific/linux/batman-adv/version.nix | 10 +- ...001-workaround-patch-for-kernel-6.10.patch | 82 - .../pkgs/os-specific/linux/ena/default.nix | 9 +- .../linux/firmware/linux-firmware/default.nix | 3 +- .../os-specific/linux/ipp-usb/default.nix | 4 +- .../os-specific/linux/kernel/kernels-org.json | 24 +- .../pkgs/os-specific/linux/kernel/patches.nix | 10 + .../linux/kernel/xanmod-kernels.nix | 8 +- .../linux/libtraceevent/default.nix | 4 +- .../pkgs/os-specific/linux/libzbc/default.nix | 4 +- .../os-specific/linux/pax-utils/default.nix | 4 +- .../pkgs/os-specific/linux/paxctl/default.nix | 2 - .../os-specific/linux/paxctl/setup-hook.sh | 8 - .../pkgs/os-specific/linux/vmware/default.nix | 10 +- .../nixpkgs/pkgs/servers/authelia/sources.nix | 2 +- .../home-assistant/component-packages.nix | 2 +- .../{default.nix => package.nix} | 0 .../alarmo/{default.nix => package.nix} | 0 .../auth-header/{default.nix => package.nix} | 0 .../average/{default.nix => package.nix} | 0 .../awtrix/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../bodymiscale/{default.nix => package.nix} | 0 .../custom-components/default.nix | 92 - .../dwd/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../emporia_vue/{default.nix => package.nix} | 0 .../epex_spot/{default.nix => package.nix} | 0 .../frigate/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../govee-lan/{default.nix => package.nix} | 0 .../gpio/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../indego/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../localtuya/{default.nix => package.nix} | 0 .../mass/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../midea_ac/{default.nix => package.nix} | 0 .../midea_ac_lan/{default.nix => package.nix} | 0 .../miele/{default.nix => package.nix} | 0 .../moonraker/{default.nix => package.nix} | 0 .../nest_protect/{default.nix => package.nix} | 0 .../ntfy/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../sensi/{default.nix => package.nix} | 0 .../smartir/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 4 +- .../solax_modbus/{default.nix => package.nix} | 0 .../solis-sensor/{default.nix => package.nix} | 0 .../somweb/{default.nix => package.nix} | 0 .../spook/{default.nix => package.nix} | 0 .../tuya_local/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../xiaomi_miot/{default.nix => package.nix} | 0 .../yassi/{default.nix => package.nix} | 0 .../hourly-weather/default.nix | 6 +- .../universal-remote-card/default.nix | 4 +- .../pkgs/servers/home-assistant/default.nix | 6 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 6 +- .../nixpkgs/pkgs/servers/mastodon/gemset.nix | 52 +- .../nixpkgs/pkgs/servers/mastodon/source.nix | 6 +- .../matrix-synapse/sliding-sync/default.nix | 37 - .../pkgs/servers/mautrix-whatsapp/default.nix | 6 +- .../grafana-image-renderer/default.nix | 6 +- .../grafana-image-renderer/package.json | 4 +- .../monitoring/prometheus/ipmi-exporter.nix | 6 +- .../prometheus/mongodb-exporter.nix | 6 +- .../prometheus/process-exporter.nix | 4 +- .../monitoring/prometheus/sql-exporter.nix | 4 +- .../pkgs/servers/mqtt/mosquitto/default.nix | 14 +- .../pkgs/servers/nats-server/default.nix | 6 +- .../pkgs/servers/nextcloud/default.nix | 4 +- .../pkgs/servers/nextcloud/packages/28.json | 40 +- .../pkgs/servers/nextcloud/packages/29.json | 44 +- .../pkgs/servers/nextcloud/packages/30.json | 46 +- .../nextcloud/packages/nextcloud-apps.json | 1 + .../nixpkgs/pkgs/servers/pleroma/default.nix | 16 +- .../servers/search/meilisearch/Cargo.lock | 1753 +- .../servers/search/meilisearch/default.nix | 14 +- .../search/meilisearch/time-crate.patch | 28 - .../servers/search/opensearch/default.nix | 4 +- .../pkgs/servers/sql/monetdb/default.nix | 4 +- .../pkgs/servers/sql/percona-server/8_0.nix | 2 +- .../pkgs/servers/sql/percona-server/8_4.nix | 2 +- .../servers/sql/postgresql/ext/pgrouting.nix | 4 +- .../nixpkgs/pkgs/servers/tautulli/default.nix | 6 +- .../pkgs/servers/teleport/14/Cargo.lock | 2014 -- .../pkgs/servers/teleport/14/default.nix | 13 - .../pkgs/servers/teleport/16/default.nix | 2 +- .../nixpkgs/pkgs/servers/teleport/default.nix | 1 - .../nixpkgs/pkgs/servers/teleport/generic.nix | 5 - .../nixpkgs/pkgs/servers/ursadb/default.nix | 4 +- .../pkgs/servers/vouch-proxy/default.nix | 4 +- .../pkgs/servers/web-apps/lemmy/pin.json | 2 +- .../pkgs/servers/web-apps/wiki-js/default.nix | 13 +- .../pkgs/servers/xmpp/ejabberd/default.nix | 174 +- .../pkgs/servers/xmpp/ejabberd/rebar-deps.nix | 278 + .../nixpkgs/pkgs/shells/ion/Cargo.lock | 946 +- .../pkgs/shells/ion/build-script.patch | 20 +- .../nixpkgs/pkgs/shells/ion/default.nix | 40 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 8 +- .../pkgs/shells/nushell/plugins/dbus.nix | 52 + .../pkgs/shells/nushell/plugins/default.nix | 8 +- .../pkgs/shells/nushell/plugins/formats.nix | 2 +- .../pkgs/shells/nushell/plugins/gstat.nix | 2 +- .../pkgs/shells/nushell/plugins/highlight.nix | 15 +- .../pkgs/shells/nushell/plugins/net.nix | 2 +- .../pkgs/shells/nushell/plugins/polars.nix | 2 +- .../pkgs/shells/nushell/plugins/query.nix | 12 +- .../pkgs/shells/nushell/plugins/skim.nix | 55 + .../pkgs/shells/nushell/plugins/units.nix | 7 +- .../nixpkgs/pkgs/test/cc-wrapper/default.nix | 49 +- third_party/nixpkgs/pkgs/test/default.nix | 2 + .../pkgs/tools/admin/mycli/default.nix | 3 + .../pkgs/tools/admin/pulumi-bin/data.nix | 578 +- .../pkgs/tools/admin/tigervnc/default.nix | 9 + .../pkgs/tools/admin/virtscreen/default.nix | 56 - .../audio/openai-whisper-cpp/default.nix | 19 +- .../tools/audio/wyoming/faster-whisper.nix | 4 +- .../pkgs/tools/backup/pgbackrest/default.nix | 4 +- .../filesystems/archivemount/default.nix | 21 - .../bcache-tools/bcache-udev-modern.patch | 2 +- .../filesystems/bcache-tools/default.nix | 7 +- .../tools/filesystems/stratisd/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/agedu/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/archi/default.nix | 3 +- .../pkgs/tools/misc/askalono/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 6 +- .../pkgs/tools/misc/clipboard-jh/default.nix | 53 +- .../tools/misc/depotdownloader/default.nix | 7 +- .../pkgs/tools/misc/depotdownloader/deps.nix | 24 +- .../pkgs/tools/misc/jfrog-cli/default.nix | 26 +- .../nixpkgs/pkgs/tools/misc/ncdu/default.nix | 8 +- .../pkgs/tools/misc/pre-commit/default.nix | 5 +- .../tools/misc/rshim-user-space/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/tlp/default.nix | 14 +- .../pkgs/tools/networking/curl/default.nix | 5 +- .../pkgs/tools/networking/ddns-go/default.nix | 6 +- .../pkgs/tools/networking/frp/default.nix | 4 +- .../pkgs/tools/networking/lychee/default.nix | 13 +- .../pkgs/tools/networking/netbird/default.nix | 6 +- .../tools/networking/nexttrace/default.nix | 6 +- .../tools/networking/smokeping/default.nix | 2 +- .../pkgs/tools/networking/spiped/default.nix | 23 +- .../networking/telepresence2/default.nix | 6 +- .../pkgs/tools/networking/veilid/Cargo.lock | 805 +- .../pkgs/tools/networking/veilid/default.nix | 4 +- .../tools/package-management/lix/default.nix | 23 +- .../pkgs/tools/security/apkleaks/default.nix | 4 +- .../pkgs/tools/security/cdxgen/default.nix | 2 +- .../pkgs/tools/security/cnspec/default.nix | 6 +- .../pkgs/tools/security/gitleaks/default.nix | 9 +- .../pkgs/tools/security/gotestwaf/default.nix | 4 +- .../pkgs/tools/security/httpx/default.nix | 6 +- .../pkgs/tools/security/ipscan/default.nix | 2 + .../tools/security/noseyparker/default.nix | 7 +- .../pkgs/tools/security/saml2aws/default.nix | 6 +- .../pkgs/tools/security/ssh-audit/default.nix | 39 +- .../security/step-kms-plugin/default.nix | 6 +- .../pkgs/tools/security/tlsx/default.nix | 6 +- .../pkgs/tools/security/vals/default.nix | 6 +- .../tools/security/vaultwarden/default.nix | 6 +- .../pkgs/tools/security/xcrawl3r/default.nix | 6 +- .../pkgs/tools/security/zlint/default.nix | 4 +- .../pkgs/tools/system/monit/default.nix | 4 +- .../nixpkgs/pkgs/tools/system/nsc/default.nix | 8 +- .../pkgs/tools/system/osquery/default.nix | 3 +- .../tools/system/osquery/toolchain-bin.nix | 15 +- .../nixpkgs/pkgs/tools/text/mark/default.nix | 6 +- .../pkgs/tools/text/nltk-data/default.nix | 5 + .../nixpkgs/pkgs/tools/text/shfmt/default.nix | 6 +- .../tools/typesetting/lowdown/default.nix | 48 +- .../virtualization/guestfs-tools/default.nix | 32 +- .../nixpkgs/pkgs/top-level/aliases.nix | 821 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 191 +- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 8 + .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 2 + .../nixpkgs/pkgs/top-level/python-aliases.nix | 12 + .../pkgs/top-level/python-packages.nix | 61 +- 1132 files changed, 65389 insertions(+), 42064 deletions(-) create mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/kmonad.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/mail/cyrus-imap.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/networking/shout.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/torrent/bitmagnet.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/video/wivrn.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix create mode 100644 third_party/nixpkgs/nixos/tests/cyrus-imap.nix create mode 100644 third_party/nixpkgs/nixos/tests/spiped.nix create mode 100644 third_party/nixpkgs/nixos/tests/wakapi.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/fceux/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gmrun/gcc43.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/writefreely/fix-go-version-error.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/zine/update-time-crate.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch create mode 100644 third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml create mode 100644 third_party/nixpkgs/pkgs/by-name/al/albedo/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/al/alioth/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/an/ani-skip/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ap/appimageupdate/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ar/archivemount/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ba/basalt-monado/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch rename third_party/nixpkgs/pkgs/{development/tools/build-managers/bear/default.nix => by-name/be/bear/package.nix} (53%) create mode 100644 third_party/nixpkgs/pkgs/by-name/bi/bitcomet/package.nix rename third_party/nixpkgs/pkgs/{development/compilers => by-name/bl}/bluespec/libstp_stub_makefile.patch (100%) rename third_party/nixpkgs/pkgs/{development/compilers/bluespec/default.nix => by-name/bl/bluespec/package.nix} (97%) create mode 100644 third_party/nixpkgs/pkgs/by-name/bu/bustools/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cabal-cli/package.nix rename third_party/nixpkgs/pkgs/{applications/misc => by-name/ca}/calibre/dont_build_unrar_plugin.patch (100%) rename third_party/nixpkgs/pkgs/{applications/misc/calibre/default.nix => by-name/ca/calibre/package.nix} (78%) rename third_party/nixpkgs/pkgs/{development/tools/rust/cargo-hakari/default.nix => by-name/ca/cargo-hakari/package.nix} (78%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/co/connman/create-libppp-compat.h.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package-lock.json create mode 100644 third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/co/cosmic-wallpapers/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/co/couchbase-shell/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hl3170cdw/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cy/cyrus-imapd/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/db/dbip-asn-lite/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/db/dbip-city-lite/package.nix rename third_party/nixpkgs/pkgs/{data/misc/dbip-country-lite/default.nix => by-name/db/dbip-country-lite/package.nix} (80%) create mode 100644 third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/dn/dnsdiag/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/dn/dnslookup/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/du/dut/package.nix rename third_party/nixpkgs/pkgs/{games => by-name/ed}/eduke32/convert-bmp-to-png.diff (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ed/eduke32/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel create mode 100644 third_party/nixpkgs/pkgs/by-name/en/envoy/rules_rust_extra.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/eq/equibop/disable_update_checking.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/eq/equibop/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/eq/equibop/use_system_equicord.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/eq/equicord/package.nix rename third_party/nixpkgs/pkgs/{games => by-name/fa}/factorio/mods.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/fa/factorio/package.nix create mode 100755 third_party/nixpkgs/pkgs/by-name/fa/factorio/update.py rename third_party/nixpkgs/pkgs/{games => by-name/fa}/factorio/utils.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json create mode 100644 third_party/nixpkgs/pkgs/by-name/fc/fceux/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fo/foxmarks/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/fr/frog-protocols/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gm/gmrun/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gn/gnome-commander/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/go/goose-lang/package.nix delete mode 100644 third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json create mode 100644 third_party/nixpkgs/pkgs/by-name/gr/graphpython/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gt/gtuber/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gw/gweled/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ha/hashes/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/in/inspector/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/jo/joe/macos-fix.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ka/kamp/package.nix rename third_party/nixpkgs/pkgs/{applications/audio/kid3/default.nix => by-name/ki/kid3/package.nix} (70%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/cluster/kubent/default.nix => by-name/ku/kubent/package.nix} (55%) rename third_party/nixpkgs/pkgs/{applications/graphics/lazpaint/default.nix => by-name/la/lazpaint/package.nix} (51%) rename third_party/nixpkgs/pkgs/{development/libraries/libguestfs/appliance.nix => by-name/li/libguestfs-appliance/package.nix} (63%) create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libguestfs-with-appliance/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libguestfs/Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch rename third_party/nixpkgs/pkgs/{development/libraries => by-name/li}/libguestfs/libguestfs-syms.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libguestfs/package.nix rename third_party/nixpkgs/pkgs/{applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch => by-name/li/libnvidia-container/fix-library-resolving.patch} (76%) rename third_party/nixpkgs/pkgs/{applications/virtualization => by-name/li}/libnvidia-container/inline-c-struct.patch (100%) rename third_party/nixpkgs/pkgs/{applications/virtualization => by-name/li}/libnvidia-container/modprobe.patch (72%) rename third_party/nixpkgs/pkgs/{applications/virtualization/libnvidia-container/default.nix => by-name/li/libnvidia-container/package.nix} (66%) create mode 100644 third_party/nixpkgs/pkgs/by-name/li/live-chart/package.nix rename third_party/nixpkgs/pkgs/{servers/monitoring/mimir/default.nix => by-name/mi/mimir/package.nix} (77%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openvmm/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openvmm/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/pappl/package.nix rename third_party/nixpkgs/pkgs/{servers/sql/patroni/default.nix => by-name/pa/patroni/package.nix} (70%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/pk/pkarr/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/po/pocketsphinx/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/py/pyfa/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/re/reader/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/re/reco/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/re/renpy/5687.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/river-bsp-layout/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ru/russ/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ry/ryokucha/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/se/seq-cli/deps.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/se/seq-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/si/simpleini/package.nix create mode 100755 third_party/nixpkgs/pkgs/by-name/sn/snipaste/update.sh create mode 100644 third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ss/sscep/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/st/stern/package.nix delete mode 100644 third_party/nixpkgs/pkgs/by-name/sw/swt/awt-libs.patch delete mode 100644 third_party/nixpkgs/pkgs/by-name/sw/swt/gtk-libs.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch rename third_party/nixpkgs/pkgs/{servers/tailscale/default.nix => by-name/ta/tailscale/package.nix} (95%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ta/taterclient-ddnet/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/te/termineter/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/tl/tlsinfo/package.nix delete mode 100644 third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/tu/tuxguitar/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/vi/virt-v2v/package.nix rename third_party/nixpkgs/pkgs/{applications/video/vivictpp/default.nix => by-name/vi/vivictpp/package.nix} (85%) create mode 100644 third_party/nixpkgs/pkgs/by-name/vt/vt323/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/vym/default.nix => by-name/vy/vym/package.nix} (75%) rename third_party/nixpkgs/pkgs/{applications/misc/vym/000-fix-zip-paths.diff => by-name/vy/vym/patches/0000-fix-zip-paths.diff} (100%) rename third_party/nixpkgs/pkgs/{applications/misc/waycorner/default.nix => by-name/wa/waycorner/package.nix} (69%) create mode 100644 third_party/nixpkgs/pkgs/by-name/wi/wivrn/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/writefreely/default.nix => by-name/wr/writefreely/package.nix} (54%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/x5/x509-limbo/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/xchm/default.nix => by-name/xc/xchm/package.nix} (90%) create mode 100644 third_party/nixpkgs/pkgs/by-name/zs/zsync2/package.nix delete mode 100644 third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/idris2/pack.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/tcl/9.0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/tk/9.0.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/patches/kons-9-fix-testsuite-compilation.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/patches/magicl-dont-build-fortran-twice.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ohex/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/crcelk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cymruwhois/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-csv/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dncil/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/imgtool/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/monkeytype/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pesq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/plotpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pocketsphinx/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-logger/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pythonqwt/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/smoke-zephyr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sotabenchapi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/submitit/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torchbench/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/binutils/support-ios.patch delete mode 100644 third_party/nixpkgs/pkgs/games/eduke32/default.nix delete mode 100644 third_party/nixpkgs/pkgs/games/factorio/default.nix delete mode 100755 third_party/nixpkgs/pkgs/games/factorio/update.py delete mode 100644 third_party/nixpkgs/pkgs/games/factorio/versions.json delete mode 100644 third_party/nixpkgs/pkgs/games/gweled/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/paxctl/setup-hook.sh rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/alarmo/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/average/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/awtrix/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/bodymiscale/{default.nix => package.nix} (100%) delete mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dwd/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/emporia_vue/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/frigate/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/garmin_connect/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/govee-lan/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/gpio/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/indego/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/local_luftdaten/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/localtuya/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac_lan/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/ntfy/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/omnik_inverter/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus_sensor/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/samsungtv-smart/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/sensi/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartir/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/{default.nix => package.nix} (90%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solis-sensor/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/somweb/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/spook/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/tuya_local/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagencarnet/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/{default.nix => package.nix} (100%) rename third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/{default.nix => package.nix} (100%) delete mode 100644 third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/search/meilisearch/time-crate.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/servers/teleport/14/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix create mode 100644 third_party/nixpkgs/pkgs/shells/nushell/plugins/dbus.nix create mode 100644 third_party/nixpkgs/pkgs/shells/nushell/plugins/skim.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix diff --git a/third_party/nixpkgs/.github/workflows/basic-eval.yml b/third_party/nixpkgs/.github/workflows/basic-eval.yml index 5a8f20eb71..b3a85c2979 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.github/workflows/basic-eval.yml @@ -26,5 +26,6 @@ jobs: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + - run: nix --experimental-features 'nix-command flakes' flake check --all-systems --no-build # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md index bc9927fe10..70e45094f2 100644 --- a/third_party/nixpkgs/CONTRIBUTING.md +++ b/third_party/nixpkgs/CONTRIBUTING.md @@ -615,6 +615,11 @@ Names of files and directories should be in lowercase, with dashes between words As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild. If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`. +# Practical contributing advice + +To contribute effectively and efficiently, you need to be aware of how the contributing process generally works. +This section aims to document the process as we live it in Nixpkgs to set expectations right and give practical tips on how to work with it. + ## I opened a PR, how do I get it merged? [i-opened-a-pr-how-do-i-get-it-merged]:#i-opened-a-pr-how-do-i-get-it-merged diff --git a/third_party/nixpkgs/ci/OWNERS b/third_party/nixpkgs/ci/OWNERS index 8decab1083..4ab451624a 100644 --- a/third_party/nixpkgs/ci/OWNERS +++ b/third_party/nixpkgs/ci/OWNERS @@ -27,7 +27,7 @@ # Libraries /lib @infinisil -/lib/systems @alyssais @ericson2314 +/lib/systems @alyssais @ericson2314 @NixOS/stdenv /lib/generators.nix @infinisil @Profpatsch /lib/cli.nix @infinisil @Profpatsch /lib/debug.nix @infinisil @Profpatsch @@ -49,10 +49,10 @@ /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron -/pkgs/stdenv @philiptaron -/pkgs/stdenv/generic @Ericson2314 -/pkgs/stdenv/generic/check-meta.nix @Ericson2314 -/pkgs/stdenv/cross @Ericson2314 +/pkgs/stdenv @philiptaron @NixOS/stdenv +/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @NixOS/stdenv +/pkgs/stdenv/cross @Ericson2314 @NixOS/stdenv /pkgs/build-support @philiptaron /pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 @@ -179,7 +179,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # C compilers /pkgs/development/compilers/gcc -/pkgs/development/compilers/llvm @alyssais @RossComputerGuy +/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm /pkgs/development/compilers/emscripten @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius @@ -351,6 +351,7 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange /pkgs/build-support/node/build-npm-package @winterqt /pkgs/build-support/node/fetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt +/pkgs/development/tools/pnpm @Scrumplex @gepbird # OCaml /pkgs/build-support/ocaml @ulrikstrid diff --git a/third_party/nixpkgs/doc/hooks/cmake.section.md b/third_party/nixpkgs/doc/hooks/cmake.section.md index b5dc5a9144..5bcc3c980f 100644 --- a/third_party/nixpkgs/doc/hooks/cmake.section.md +++ b/third_party/nixpkgs/doc/hooks/cmake.section.md @@ -1,3 +1,35 @@ # cmake {#cmake} -Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. +Overrides the default configure phase to run the CMake command. + +By default, we use the Make generator of CMake. +But when Ninja is also available as a `nativeBuildInput`, this setup hook will detect that and use the ninja generator. + +Dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. +Some additional flags are passed in to give similar behavior to configure-based packages. + +By default, parallel building is enabled as CMake supports parallel building almost everywhere. + +You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. + +## Variables controlling CMake {#cmake-variables-controlling} + +### CMake Exclusive Variables {#cmake-exclusive-variables} + +#### `cmakeFlags` {#cmake-flags} + +Controls the flags passed to `cmake setup` during configure phase. + +#### `cmakeBuildDir` {#cmake-build-dir} + +Directory where CMake will put intermediate files. + +Setting this can be useful for debugging multiple CMake builds while in the same source directory, for example, when building for different platforms. +Different values for each build will prevent build artefacts from interefering with each other. +This setting has no tangible effect when running the build in a sandboxed derivation. + +The default value is `build`. + +#### `dontUseCmakeConfigure` {#dont-use-cmake-configure} + +When set to true, don't use the predefined `cmakeConfigurePhase`. diff --git a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md index b4999aec87..02dfa3508c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md @@ -155,9 +155,11 @@ There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random pack Package is missing some GSettings schemas. You can find out the package containing the schema with `nix-locate org.gnome.foo.gschema.xml` and let the hooks handle the wrapping as [above](#ssec-gnome-common-issues-no-schemas). -### When using `wrapGApps*` hook with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped} +### When using `wrapGApps*` hook with special derivers or hooks you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped} -This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGApps*` hook automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another. +This is because some setup hooks like `qt6.wrapQtAppsHook` also wrap programs using `makeWrapper`. Likewise, some derivers (e.g. `python.pkgs.buildPythonApplication`) automatically pull in their own setup hooks that produce wrappers. + +The simplest workaround is to disable the `wrapGApps*` hook's automatic wrapping using `dontWrapGApps = true;` while passing its `makeWrapper` arguments to another wrapper. In the case of a Python application it could look like: @@ -184,19 +186,19 @@ python3.pkgs.buildPythonApplication { And for a QT app like: ```nix -mkDerivation { +stdenv.mkDerivation { pname = "calibre"; version = "3.47.0"; nativeBuildInputs = [ wrapGAppsHook3 + qt6.wrapQtAppsHook qmake # ... ]; dontWrapGApps = true; - # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index 5a9144792d..c79fd3a55d 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -232,6 +232,19 @@ To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-upda Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. +### Testing Neovim plugins {#testing-neovim-plugins} + +`nvimRequireCheck=MODULE` is a simple test which checks if Neovim can requires the lua module `MODULE` without errors. This is often enough to catch missing dependencies. + +This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). + +```nix + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + nvimRequireCheck = "gitsigns"; + }; +``` + ### Plugin optional configuration {#vim-plugin-required-snippet} Some plugins require specific configuration to work. We choose not to diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md index 76c931ba04..071358b994 100644 --- a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md @@ -181,6 +181,31 @@ Example of an error which this fixes. `[Errno 8] Exec format error: './gdk3-scan'` +#### Using `-static` outside a `isStatic` platform. {#cross-static-on-non-static-platform} + +Add `stdenv.cc.libc.static` (static output of glibc) to `buildInputs` conditionally on if `hostPlatform` uses `glibc`. + + +e.g. + +```nix +{ + buildInputs = lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; +} +``` + +Examples of errors which this fixes. + +`cannot find -lm: No such file or directory` + +`cannot find -lc: No such file or directory` + +::: {.note} +At the time of writing it is assumed the issue only happens on `glibc` because it splits the static libraries in to a different output. + +::: {.note} +You may want to look in to using `stdenvAdapters.makeStatic` or `pkgsStatic` or a `isStatic = true` platform. + ## Cross-building packages {#sec-cross-usage} Nixpkgs can be instantiated with `localSystem` alone, in which case there is no cross-compiling and everything is built by and for that system, or also with `crossSystem`, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, `lib.systems.examples` has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line: diff --git a/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md b/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md index 5e86d2aa3d..09fdba01c4 100644 --- a/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md @@ -21,7 +21,7 @@ In the Nix language the individual outputs can be reached explicitly as attribut When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See [](#multiple-output-file-type-groups).) -In some cases it may be desirable to combine different outputs under a single store path. A function `symlinkJoin` can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.) +In some cases it may be desirable to combine different outputs under a single store path. The `symlinkJoin` builder can be used to do this. (See [](#trivial-builder-symlinkJoin)). Note that this may negate some closure size benefits of using a multiple-output package. ## Writing a split derivation {#sec-multiple-outputs-} diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index 950eb2b5c4..9873c1c949 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -80,8 +80,17 @@ checks = forAllSystems (system: { tarball = jobs.${system}.tarball; - # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 - } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { + } // lib.optionalAttrs + ( + self.legacyPackages.${system}.stdenv.hostPlatform.isLinux + # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 + && !self.legacyPackages.${system}.targetPlatform.isPower64 + # Exclude armv6l-linux due to "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" + && system != "armv6l-linux" + # Exclude riscv64-linux due to "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" + && system != "riscv64-linux" + ) + { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` @@ -111,10 +120,20 @@ }).nixos.manual; }; - devShells = forAllSystems (system: { - /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ - default = import ./shell.nix { inherit system; }; - }); + devShells = forAllSystems (system: + { } // lib.optionalAttrs + ( + # Exclude armv6l-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + system != "armv6l-linux" + # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + && system != "riscv64-linux" + # Exclude FreeBSD because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + && !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD + ) + { + /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ + default = import ./shell.nix { inherit system; }; + }); /** A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 5d2d0e1c0e..93ecaaf309 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -662,6 +662,13 @@ githubId = 4296804; name = "Alex Franchuk"; }; + aftix = { + name = "Wyatt Campbell"; + email = "aftix@aftix.xyz"; + matrix = "@aftix:matrix.org"; + github = "aftix"; + githubId = 4008299; + }; agbrooks = { email = "andrewgrantbrooks@gmail.com"; github = "agbrooks"; @@ -1708,6 +1715,12 @@ githubId = 718812; name = "Antoine R. Dumont"; }; + areif-dev = { + email = "aj@ajreifsnyder.com"; + github = "areif-dev"; + githubId = 53097078; + name = "AJ Reifsnyder"; + }; arezvov = { email = "alex@rezvov.ru"; github = "arezvov"; @@ -1804,6 +1817,13 @@ githubId = 338268; name = "Alexei Robyn"; }; + artem = { + email = "a@pelenitsyn.top"; + github = "ulysses4ever"; + githubId = 6832600; + name = "Artem Pelenitsyn"; + matrix = "@artem.types:matrix.org"; + }; artemist = { email = "me@artem.ist"; github = "artemist"; @@ -2328,6 +2348,12 @@ githubId = 18467667; name = "Alexander Bantyev"; }; + balssh = { + email = "george.bals25@gmail.com"; + github = "balssh"; + githubId = 82440615; + name = "George Bals"; + }; bananad3v = { email = "banana@banana.is-cool.dev"; github = "BANanaD3V"; @@ -2996,6 +3022,12 @@ githubId = 68566724; name = "bootstrap-prime"; }; + booxter = { + email = "ihar.hrachyshka@gmail.com"; + github = "booxter"; + githubId = 90200; + name = "Ihar Hrachyshka"; + }; boozedog = { email = "code@booze.dog"; github = "boozedog"; @@ -3823,6 +3855,12 @@ github = "CHN-beta"; githubId = 35858462; }; + cholli = { + email = "christoph.hollizeck@hey.com"; + github = "Daholli"; + githubId = 25060097; + name = "Christoph Hollizeck"; + }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; @@ -6511,6 +6549,13 @@ githubId = 46724898; name = "Erik Backman"; }; + erikeah = { + email = "erikeah@protonmail.com"; + github = "erikeah"; + githubId = 11900869; + keys = [ { fingerprint = "4142 0380 C7F8 BCDA CC9E 7ABA 0FF3 076B 71F2 5DEF"; } ]; + name = "Erik Alonso"; + }; erikryb = { email = "erik.rybakken@math.ntnu.no"; github = "erikryb"; @@ -7608,6 +7653,12 @@ githubId = 91987; name = "Jim Garrison"; }; + garyguo = { + email = "gary@garyguo.net"; + github = "nbdd0121"; + githubId = 4065244; + name = "Gary Guo"; + }; gavin = { email = "gavin.rogers@holo.host"; github = "gavinrogers"; @@ -7853,6 +7904,17 @@ githubId = 15957973; name = "Jeffry Molanus"; }; + gileri = { + email = "s@linuxw.info"; + github = "gileri"; + githubId = 493438; + name = "Éric Gillet"; + keys = [ + { + fingerprint = "E478 85DC 8F33 FA86 D3FC 183D 80A8 14DB 8ED5 70BC"; + } + ]; + }; gilice = { email = "gilice@proton.me"; github = "gilice"; @@ -8182,7 +8244,8 @@ email = "guanran928@outlook.com"; github = "Guanran928"; githubId = 68757440; - name = "Guanran928"; + name = "Guanran Wang"; + keys = [ { fingerprint = "7835 BC13 4560 0660 0448 5A2C 91F9 7D9E D126 39CF"; } ]; }; guekka = { github = "Guekka"; @@ -8882,6 +8945,12 @@ githubId = 6109326; name = "David Hummel"; }; + husjon = { + name = "Jon Erling Hustadnes"; + email = "jonerling.hustadnes+nixpkgs@gmail.com"; + github = "husjon"; + githubId = 554229; + }; husky = { email = "husky@husky.sh"; github = "huskyistaken"; @@ -9424,6 +9493,12 @@ githubId = 1318743; name = "Ivar"; }; + ivyfanchiang = { + email = "dev@ivyfanchiang.ca"; + github = "hexadecimalDinosaur"; + githubId = 36890802; + name = "Ivy Fan-Chiang"; + }; iwanb = { email = "tracnar@gmail.com"; github = "iwanb"; @@ -10746,6 +10821,12 @@ githubId = 79042825; name = "Jan Kremer"; }; + JulianFP = { + name = "Julian Partanen"; + github = "JulianFP"; + githubId = 70963316; + keys = [ { fingerprint = "C61D 7747 43DE EF05 4E4A 3AC1 6FE2 79EB 5C9F 3466"; } ]; + }; juliendehos = { email = "dehos@lisic.univ-littoral.fr"; github = "juliendehos"; @@ -11489,6 +11570,12 @@ githubId = 17219127; name = "kotatsuyaki"; }; + kototama = { + email = "kototama@posteo.net"; + github = "kototama"; + githubId = 128620; + name = "Kototama"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -12668,6 +12755,12 @@ githubId = 26020062; name = "lumi"; }; + luna_1024 = { + email = "contact@luna.computer"; + github = "luna-1024"; + githubId = 7243615; + name = "Luna"; + }; lunarequest = { email = "nullarequest@vivlaid.net"; github = "Lunarequest"; @@ -13667,6 +13760,12 @@ githubId = 1215331; name = "Matt Melling"; }; + melon = { + email = "melontime05@gmail.com"; + github = "BlaiZephyr"; + githubId = 101197249; + name = "Tim"; + }; melsigl = { email = "melanie.bianca.sigl@gmail.com"; github = "melsigl"; @@ -14489,6 +14588,12 @@ name = "Arthur Outhenin-Chalandre"; githubId = 3845213; }; + mrgiles = { + email = "marcelogiles@gmail.com"; + github = "mrgiles"; + githubId = 4009450; + name = "Marcelo Giles"; + }; mrityunjaygr8 = { email = "mrityunjaysaxena1996@gmail.com"; github = "mrityunjaygr8"; @@ -15270,12 +15375,6 @@ github = "niklaskorz"; githubId = 590517; }; - NikolaMandic = { - email = "nikola@mandic.email"; - github = "NikolaMandic"; - githubId = 4368690; - name = "Ratko Mladic"; - }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; @@ -15850,6 +15949,12 @@ githubId = 72201; name = "Ole Jørgen Brønner"; }; + olifloof = { + email = "benmoreosm@gmail.com"; + github = "olifloof"; + githubId = 35699052; + name = "oli"; + }; oliver-koss = { email = "oliver.koss06@gmail.com"; github = "oliver-koss"; @@ -16163,6 +16268,12 @@ githubId = 10776658; name = "Patrick Gordon"; }; + paepcke = { + email = "git@paepcke.de"; + github = "paepckehh"; + githubId = 120342602; + name = "Michael Paepcke"; + }; paholg = { email = "paho@paholg.com"; github = "paholg"; @@ -16546,6 +16657,13 @@ githubId = 28323; name = "Peter Simons"; }; + petrkozorezov = { + email = "petr.kozorezov@gmail.com"; + github = "petrkozorezov"; + githubId = 645017; + name = "Petr Kozorezov"; + keys = [ { fingerprint = "7F1A 353D 3D6D 9CEF 63A9 B5C6 699F 32D5 9999 7C90"; } ]; + }; petrosagg = { email = "petrosagg@gmail.com"; github = "petrosagg"; @@ -16774,12 +16892,6 @@ name = "Jelle Besseling"; keys = [ { fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; } ]; }; - pinkcreeper100 = { - email = "benmoreosm@gmail.com"; - github = "pinkcreeper100"; - githubId = 35699052; - name = "Oliver Samuel Morris"; - }; pinpox = { email = "mail@pablo.tools"; github = "pinpox"; @@ -18291,7 +18403,7 @@ }; rnhmjoj = { email = "rnhmjoj@inventati.org"; - matrix = "@rnhmjoj:maxwell.ydns.eu"; + matrix = "@rnhmjoj:eurofusion.eu"; github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; @@ -18709,6 +18821,12 @@ githubId = 141248; name = "Ramses"; }; + rvfg = { + email = "i@rvf6.com"; + github = "duament"; + githubId = 30264485; + name = "Rvfg"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; @@ -20004,6 +20122,12 @@ githubId = 7091399; keys = [ { fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; } ]; }; + smonson = { + name = "Samuel Monson"; + email = "smonson@irbash.net"; + github = "sjmonson"; + githubId = 17662218; + }; smrehman = { name = "Syed Moiz Ur Rehman"; email = "smrehman@proton.me"; diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 1821660a50..9b6bcd5fb5 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -963,6 +963,21 @@ with lib.maintainers; shortName = "Serokell employees"; }; + stdenv = { + members = [ + artturin + emily + ericson2314 + philiptaron + reckenrode + RossComputerGuy + ]; + scope = "Maintain the standard environment and its surrounding logic."; + shortName = "stdenv"; + enableFeatureFreezePing = true; + githubTeams = [ "stdenv" ]; + }; + steam = { members = [ atemu diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md index 27c027d385..2d32f06987 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md @@ -18,14 +18,9 @@ This installs the sway compositor along with some essential utilities. Now you can start sway from the TTY console. If you are using a wlroots-based compositor, like sway, and want to be -able to share your screen, you might want to activate this option: - -```nix -{ - xdg.portal.wlr.enable = true; -} -``` - -and configure Pipewire using +able to share your screen, make sure to configure Pipewire using [](#opt-services.pipewire.enable) and related options. + +For more helpful tips and tricks, see the +[wiki page about Sway](https://wiki.nixos.org/wiki/Sway). diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2405.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2405.section.md index 158257f20a..aee8b80727 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2405.section.md @@ -201,6 +201,8 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [watchdogd](https://troglobit.com/projects/watchdogd/), a system and process supervisor using watchdog timers. Available as [services.watchdogd](#opt-services.watchdogd.enable). +- [WiVRn](https://github.com/Meumeu/WiVRn), an OpenXR streaming application. Available as [services.wivrn](#opt-services.wivrn.enable). + - [Workout-tracker](https://github.com/jovandeginste/workout-tracker), a workout tracking web application for personal use. - [wyoming-satellite](https://github.com/rhasspy/wyoming-satellite), a voice assistant satellite for Home Assistant using the Wyoming protocol. Available as [services.wyoming.satellite](#opt-services.wyoming.satellite.enable). diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md index a57633fae2..d0c1e1af6f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md @@ -73,6 +73,8 @@ ## New Modules {#sec-release-24.11-new-modules} +- [Cyrus IMAP](https://github.com/cyrusimap/cyrus-imapd), an email, contacts and calendar server. Available as [services.cyrus-imap](#opt-services.cyrus-imap.enable) service. + - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. @@ -165,6 +167,9 @@ - [chromadb](https://www.trychroma.com/), an open-source AI application database. Batteries included. Available as [services.chromadb](options.html#opt-services.chromadb.enable). +- [bitmagnet](https://bitmagnet.io/), A self-hosted BitTorrent indexer, DHT crawler, content classifier and torrent search engine with web UI, GraphQL API and Servarr stack integration. + Available as [services.bitmagnet](options.html#opt-services.bitmagnet.enable). + - [Wakapi](https://wakapi.dev/), a time tracking software for programmers. Available as [services.wakapi](#opt-services.wakapi.enable). - [foot](https://codeberg.org/dnkl/foot), a fast, lightweight and minimalistic Wayland terminal emulator. Available as [programs.foot](#opt-programs.foot.enable). @@ -267,6 +272,8 @@ - The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network. +- `mautrix-whatsapp` has been updated to version 0.11.0, which is a major rewrite of the bridge. Config file changes are required. + - qBittorrent has been updated to major version 5, which drops support for Qt 5. The `qbittorrent-qt5` package has been removed. @@ -355,6 +362,16 @@ - `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042. +- `nodePackages.coc-metals` was removed due to being deprecated upstream. + `vimPlugins.nvim-metals` is its official replacement. + +- `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0. + +- `nodePackages.coc-tslint`, `vimPlugins.coc-tslint`, `nodePackages.coc-tslint-plugin`, + and `vimPlugins.coc-tslint-plugin` were removed due to being deprecated upstream. The + `nodePackages.coc-eslint` and `vimPlugins.coc-eslint` packages offer comparable + features for `eslint`, which replaced `tslint`. + - `teleport` has been upgraded from major version 15 to major version 16. Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324). @@ -506,6 +523,10 @@ - `services.mautrix-meta` was updated to [0.4](https://github.com/mautrix/meta/releases/tag/v0.4.0). This release makes significant changes to the settings format. If you have custom settings you should migrate them to the new format. Unfortunately upstream provides little guidance for how to do this, but [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) may serve as a useful reference. The NixOS module should warn you if you still have any old settings configured. +- The `nodePackages.shout` package has been removed because it was deprecated upstream in favor of `thelounge`. + The `shout` top-level attribute was an alias to this package. + The associated `services.shout` module has also been removed. + - The `indi-full` package no longer contains non-free drivers. To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers. E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}` @@ -717,6 +738,8 @@ This saves UPS battery and ensures that host(s) get back up again when power comes back, even in the scenario when the UPS would have had enough capacity to keep power on during the whole power outage. If you like the old behaviour of keeping the UPSs on (and emptying the battery) after the host(s) have shut down, and risk not getting a power cycle event to get the host(s) back up, set `power.ups.upsmon.settings.POWERDOWNFLAG = null;`. +- `nixos-firewall-tool` now supports nftables in addition to iptables and is installed by default when NixOS firewall is enabled. + - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners should be changed to using *runner authentication tokens* by configuring diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 8b0127dc29..ab3568c4d9 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -236,7 +236,7 @@ in riemanntools = 203; subsonic = 204; # riak = 205; # unused, remove 2022-07-22 - #shout = 206; # dynamically allocated as of 2021-09-18 + #shout = 206; # dynamically allocated as of 2021-09-18, module removed 2024-10-19 gateone = 207; namecoin = 208; #lxd = 210; # unused diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 6ac03cca94..e84580f8f0 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -593,6 +593,7 @@ ./services/hardware/irqbalance.nix ./services/hardware/joycond.nix ./services/hardware/kanata.nix + ./services/hardware/kmonad.nix ./services/hardware/lcd.nix ./services/hardware/libinput.nix ./services/hardware/lirc.nix @@ -660,6 +661,7 @@ ./services/logging/ulogd.nix ./services/mail/automx2.nix ./services/mail/clamsmtp.nix + ./services/mail/cyrus-imap.nix ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix @@ -709,7 +711,6 @@ ./services/matrix/mjolnir.nix ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix - ./services/matrix/matrix-sliding-sync.nix ./services/matrix/synapse.nix ./services/misc/airsonic.nix ./services/misc/amazon-ssm-agent.nix @@ -1204,7 +1205,6 @@ ./services/networking/shellhub-agent.nix ./services/networking/shorewall.nix ./services/networking/shorewall6.nix - ./services/networking/shout.nix ./services/networking/sing-box.nix ./services/networking/sitespeed-io.nix ./services/networking/skydns.nix @@ -1359,6 +1359,7 @@ ./services/system/uptimed.nix ./services/system/userborn.nix ./services/system/zram-generator.nix + ./services/torrent/bitmagnet.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix ./services/torrent/flood.nix @@ -1379,6 +1380,7 @@ ./services/video/photonvision.nix ./services/video/mediamtx.nix ./services/video/v4l2-relayd.nix + ./services/video/wivrn.nix ./services/wayland/cage.nix ./services/wayland/hypridle.nix ./services/web-apps/akkoma.nix @@ -1469,6 +1471,7 @@ ./services/web-apps/netbox.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nextcloud-notify_push.nix + ./services/web-apps/nextcloud-whiteboard-server.nix ./services/web-apps/nextjs-ollama-llm-ui.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 762c3ddbae..160ad91e42 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -87,6 +87,7 @@ in (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") + (mkRemovedOptionModule [ "services" "matrix-sliding-sync" ] "The matrix-sliding-sync package has been removed, since matrix-synapse incorporated its functionality") (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mxisd" ] "The mxisd module has been removed as both mxisd and ma1sd got removed.") @@ -102,6 +103,7 @@ in (mkRemovedOptionModule [ "services" "railcar" ] "the corresponding package has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "replay-sorcery" ] "the corresponding package has been removed from nixpkgs as it is unmaintained upstream. Consider using `gpu-screen-recorder` or `obs-studio` instead.") (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "shout" ] "shout was removed because it was deprecated upstream in favor of thelounge.") (mkRemovedOptionModule [ "services" "ssmtp" ] '' The ssmtp package and the corresponding module have been removed due to the program being unmaintained. The options `programs.msmtp.*` can be diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index acd0673877..e50038ecbe 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -1168,8 +1168,7 @@ in If set, users can authenticate with their Kerberos password. This requires a valid Kerberos configuration - (`config.security.krb5.enable` should be set to - `true`). + (`security.krb5.enable` should be set to `true`). Note that the Kerberos PAM modules are not necessary when using SSS to handle Kerberos authentication. @@ -1587,8 +1586,8 @@ in warnings = lib.optional (with config.security.pam.sshAgentAuth; - enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles) - ''config.security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory. + enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles) '' + security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory. Specifying user-writeable files there result in an insecure configuration: a malicious process can then edit such an authorized_keys file and bypass the ssh-agent-based authentication. diff --git a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix index af7b27f28e..890bda68e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix @@ -12,7 +12,7 @@ activationScript = '' # will be rebuilt automatically - rm -fv $HOME/.cache/ksycoca* + rm -fv "$HOME/.cache/ksycoca"* ''; in { options = { @@ -79,6 +79,7 @@ in { kio-fuse # fuse interface for KIO kpackage # provides kpackagetool tool kservice # provides kbuildsycoca6 tool + kunifiedpush # provides a background service and a KCM kwallet # provides helper service kwallet-pam # provides helper service kwalletmanager # provides KCMs and stuff diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/kmonad.nix b/third_party/nixpkgs/nixos/modules/services/hardware/kmonad.nix new file mode 100644 index 0000000000..bc1b5409f9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/kmonad.nix @@ -0,0 +1,190 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.kmonad; + + # Per-keyboard options: + keyboard = + { name, ... }: + { + options = { + name = lib.mkOption { + type = lib.types.str; + example = "laptop-internal"; + description = "Keyboard name."; + }; + + device = lib.mkOption { + type = lib.types.path; + example = "/dev/input/by-id/some-dev"; + description = "Path to the keyboard's device file."; + }; + + extraGroups = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Extra permission groups to attach to the KMonad instance for + this keyboard. + + Since KMonad runs as an unprivileged user, it may sometimes + need extra permissions in order to read the keyboard device + file. If your keyboard's device file isn't in the input + group you'll need to list its group in this option. + ''; + }; + + defcfg = { + enable = lib.mkEnableOption '' + Automatically generate the defcfg block. + + When this is option is set to true the config option for + this keyboard should not include a defcfg block. + ''; + + compose = { + key = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = "ralt"; + description = "The (optional) compose key to use."; + }; + + delay = lib.mkOption { + type = lib.types.int; + default = 5; + description = "The delay (in milliseconds) between compose key sequences."; + }; + }; + + fallthrough = lib.mkEnableOption "Re-emit unhandled key events."; + + allowCommands = lib.mkEnableOption "Allow keys to run shell commands."; + }; + + config = lib.mkOption { + type = lib.types.lines; + description = "Keyboard configuration."; + }; + }; + + config = { + name = lib.mkDefault name; + }; + }; + + # Create a complete KMonad configuration file: + mkCfg = + keyboard: + let + defcfg = '' + (defcfg + input (device-file "${keyboard.device}") + output (uinput-sink "kmonad-${keyboard.name}") + ${ + lib.optionalString (keyboard.defcfg.compose.key != null) '' + cmp-seq ${keyboard.defcfg.compose.key} + cmp-seq-delay ${toString keyboard.defcfg.compose.delay} + '' + } + fallthrough ${lib.boolToString keyboard.defcfg.fallthrough} + allow-cmd ${lib.boolToString keyboard.defcfg.allowCommands} + ) + ''; + in + pkgs.writeTextFile { + name = "kmonad-${keyboard.name}.cfg"; + text = lib.optionalString keyboard.defcfg.enable (defcfg + "\n") + keyboard.config; + checkPhase = "${cfg.package}/bin/kmonad -d $out"; + }; + + # Build a systemd path config that starts the service below when a + # keyboard device appears: + mkPath = + keyboard: + let + name = "kmonad-${keyboard.name}"; + in + lib.nameValuePair name { + description = "KMonad trigger for ${keyboard.device}"; + wantedBy = [ "paths.target" ]; + pathConfig = { + Unit = "${name}.service"; + PathExists = keyboard.device; + }; + }; + + # Build a systemd service that starts KMonad: + mkService = + keyboard: + let + cmd = [ + (lib.getExe cfg.package) + "--input" + ''device-file "${keyboard.device}"'' + ] ++ cfg.extraArgs ++ [ "${mkCfg keyboard}" ]; + in + lib.nameValuePair "kmonad-${keyboard.name}" { + description = "KMonad for ${keyboard.device}"; + script = lib.escapeShellArgs cmd; + unitConfig = { + # Control rate limiting. + # Stop the restart logic if we restart more than + # StartLimitBurst times in a period of StartLimitIntervalSec. + StartLimitIntervalSec = 2; + StartLimitBurst = 5; + }; + serviceConfig = { + Restart = "always"; + # Restart at increasing intervals from 2s to 1m + RestartSec = 2; + RestartSteps = 30; + RestartMaxDelaySec = "1min"; + Nice = -20; + DynamicUser = true; + User = "kmonad"; + Group = "kmonad"; + SupplementaryGroups = [ + # These ensure that our dynamic user has access to the device node + config.users.groups.input.name + config.users.groups.uinput.name + ] ++ keyboard.extraGroups; + }; + }; +in +{ + options.services.kmonad = { + enable = lib.mkEnableOption "KMonad: An advanced keyboard manager."; + + package = lib.mkPackageOption pkgs "kmonad" { }; + + keyboards = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule keyboard); + default = { }; + description = "Keyboard configuration."; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ + "--log-level" + "debug" + ]; + description = "Extra arguments to pass to KMonad."; + }; + }; + + config = lib.mkIf cfg.enable { + hardware.uinput.enable = true; + + systemd = { + paths = lib.mapAttrs' (_: mkPath) cfg.keyboards; + services = lib.mapAttrs' (_: mkService) cfg.keyboards; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index 450651e8b6..3538e52bda 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -78,6 +78,11 @@ }; config = lib.mkIf config.hardware.nvidia-container-toolkit.enable { + assertions = [ + { assertion = config.hardware.nvidia.datacenter.enable || lib.elem "nvidia" config.services.xserver.videoDrivers; + message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`''; + }]; + virtualisation.docker = { daemon.settings = lib.mkIf (lib.versionAtLeast config.virtualisation.docker.package.version "25") { @@ -130,9 +135,6 @@ ]); }; - services.xserver.videoDrivers = lib.mkIf - (!config.hardware.nvidia.datacenter.enable) [ "nvidia" ]; - systemd.services.nvidia-container-toolkit-cdi-generator = { description = "Container Device Interface (CDI) for Nvidia generator"; wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/cyrus-imap.nix b/third_party/nixpkgs/nixos/modules/services/mail/cyrus-imap.nix new file mode 100644 index 0000000000..f5ace168b0 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/mail/cyrus-imap.nix @@ -0,0 +1,379 @@ +{ + pkgs, + lib, + config, + ... +}: +let + cfg = config.services.cyrus-imap; + cyrus-imapdPkg = pkgs.cyrus-imapd; + inherit (lib) + mkEnableOption + mkIf + mkOption + optionalAttrs + optionalString + generators + mapAttrsToList + ; + inherit (lib.strings) concatStringsSep; + inherit (lib.types) + attrsOf + submodule + listOf + oneOf + str + int + bool + nullOr + path + ; + + mkCyrusConfig = + settings: + let + mkCyrusOptionsList = + v: + mapAttrsToList ( + p: q: + if (q != null) then + if builtins.isInt q then + "${p}=${builtins.toString q}" + else + "${p}=\"${if builtins.isList q then (concatStringsSep " " q) else q}\"" + else + "" + ) v; + mkCyrusOptionsString = v: concatStringsSep " " (mkCyrusOptionsList v); + in + concatStringsSep "\n " (mapAttrsToList (n: v: n + " " + (mkCyrusOptionsString v)) settings); + + cyrusConfig = lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + ${n} { + ${mkCyrusConfig v} + } + '') cfg.cyrusSettings + ); + + imapdConfig = + with generators; + toKeyValue { + mkKeyValue = mkKeyValueDefault { + mkValueString = + v: + if builtins.isBool v then + if v then "yes" else "no" + else if builtins.isList v then + concatStringsSep " " v + else + mkValueStringDefault { } v; + } ": "; + } cfg.imapdSettings; +in +{ + options.services.cyrus-imap = { + enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server"; + debug = mkEnableOption "debugging messages for the Cyrus master process"; + + listenQueue = mkOption { + type = int; + default = 32; + description = '' + Socket listen queue backlog size. See listen(2) for more information about a backlog. + Default is 32, which may be increased if you have a very high connection rate. + ''; + }; + tmpDBDir = mkOption { + type = path; + default = "/run/cyrus/db"; + description = '' + Location where DB files are stored. + Databases in this directory are recreated upon startup, so ideally they should live in ephemeral storage for best performance. + ''; + }; + cyrusSettings = mkOption { + type = submodule { + freeformType = attrsOf ( + attrsOf (oneOf [ + bool + int + (listOf str) + ]) + ); + options = { + START = mkOption { + default = { + recover = { + cmd = [ + "ctl_cyrusdb" + "-r" + ]; + }; + }; + description = '' + This section lists the processes to run before any SERVICES are spawned. + This section is typically used to initialize databases. + Master itself will not startup until all tasks in START have completed, so put no blocking commands here. + ''; + }; + SERVICES = mkOption { + default = { + imap = { + cmd = [ "imapd" ]; + listen = "imap"; + prefork = 0; + }; + pop3 = { + cmd = [ "pop3d" ]; + listen = "pop3"; + prefork = 0; + }; + lmtpunix = { + cmd = [ "lmtpd" ]; + listen = "/run/cyrus/lmtp"; + prefork = 0; + }; + notify = { + cmd = [ "notifyd" ]; + listen = "/run/cyrus/notify"; + proto = "udp"; + prefork = 0; + }; + }; + description = '' + This section is the heart of the cyrus.conf file. It lists the processes that should be spawned to handle client connections made on certain Internet/UNIX sockets. + ''; + }; + EVENTS = mkOption { + default = { + tlsprune = { + cmd = [ "tls_prune" ]; + at = 400; + }; + delprune = { + cmd = [ + "cyr_expire" + "-E" + "3" + ]; + at = 400; + }; + deleteprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-D" + "28" + ]; + at = 430; + }; + expungeprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-X" + "28" + ]; + at = 445; + }; + checkpoint = { + cmd = [ + "ctl_cyrusdb" + "-c" + ]; + period = 30; + }; + }; + description = '' + This section lists processes that should be run at specific intervals, similar to cron jobs. This section is typically used to perform scheduled cleanup/maintenance. + ''; + }; + DAEMON = mkOption { + default = { }; + description = '' + This section lists long running daemons to start before any SERVICES are spawned. master(8) will ensure that these processes are running, restarting any process which dies or forks. All listed processes will be shutdown when master(8) is exiting. + ''; + }; + }; + }; + description = "Cyrus configuration settings. See [cyrus.conf(5)](https://www.cyrusimap.org/imap/reference/manpages/configs/cyrus.conf.html)"; + }; + imapdSettings = mkOption { + type = submodule { + freeformType = attrsOf (oneOf [ + str + int + bool + (listOf str) + ]); + options = { + configdirectory = mkOption { + type = path; + default = "/var/lib/cyrus"; + description = '' + The pathname of the IMAP configuration directory. + ''; + }; + lmtpsocket = mkOption { + type = path; + default = "/run/cyrus/lmtp"; + description = '' + Unix socket that lmtpd listens on, used by deliver(8). This should match the path specified in cyrus.conf(5). + ''; + }; + idlesocket = mkOption { + type = path; + default = "/run/cyrus/idle"; + description = '' + Unix socket that idled listens on. + ''; + }; + notifysocket = mkOption { + type = path; + default = "/run/cyrus/notify"; + description = '' + Unix domain socket that the mail notification daemon listens on. + ''; + }; + }; + }; + default = { + admins = [ "cyrus" ]; + allowplaintext = true; + defaultdomain = "localhost"; + defaultpartition = "default"; + duplicate_db_path = "/run/cyrus/db/deliver.db"; + hashimapspool = true; + httpmodules = [ + "carddav" + "caldav" + ]; + mboxname_lockpath = "/run/cyrus/lock"; + partition-default = "/var/lib/cyrus/storage"; + popminpoll = 1; + proc_path = "/run/cyrus/proc"; + ptscache_db_path = "/run/cyrus/db/ptscache.db"; + sasl_auto_transition = true; + sasl_pwcheck_method = [ "saslauthd" ]; + sievedir = "/var/lib/cyrus/sieve"; + statuscache_db_path = "/run/cyrus/db/statuscache.db"; + syslog_prefix = "cyrus"; + tls_client_ca_dir = "/etc/ssl/certs"; + tls_session_timeout = 1440; + tls_sessions_db_path = "/run/cyrus/db/tls_sessions.db"; + virtdomains = "on"; + }; + description = "IMAP configuration settings. See [imapd.conf(5)](https://www.cyrusimap.org/imap/reference/manpages/configs/imapd.conf.html)"; + }; + + user = mkOption { + type = nullOr str; + default = null; + description = "Cyrus IMAP user name. If this is not set, a user named `cyrus` will be created."; + }; + + group = mkOption { + type = nullOr str; + default = null; + description = "Cyrus IMAP group name. If this is not set, a group named `cyrus` will be created."; + }; + + imapdConfigFile = mkOption { + type = nullOr path; + default = null; + description = "Path to the configuration file used for cyrus-imap."; + apply = v: if v != null then v else pkgs.writeText "imapd.conf" imapdConfig; + }; + + cyrusConfigFile = mkOption { + type = nullOr path; + default = null; + description = "Path to the configuration file used for Cyrus."; + apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig; + }; + + sslCACert = mkOption { + type = nullOr str; + default = null; + description = "File path which containing one or more CA certificates to use."; + }; + + sslServerCert = mkOption { + type = nullOr str; + default = null; + description = "File containing the global certificate used for all services (IMAP, POP3, LMTP, Sieve)"; + }; + + sslServerKey = mkOption { + type = nullOr str; + default = null; + description = "File containing the private key belonging to the global server certificate."; + }; + }; + + config = mkIf cfg.enable { + users.users.cyrus = optionalAttrs (cfg.user == null) { + description = "Cyrus IMAP user"; + isSystemUser = true; + group = optionalString (cfg.group == null) "cyrus"; + }; + + users.groups.cyrus = optionalAttrs (cfg.group == null) { }; + + environment.etc."imapd.conf".source = cfg.imapdConfigFile; + environment.etc."cyrus.conf".source = cfg.cyrusConfigFile; + + systemd.services.cyrus-imap = { + description = "Cyrus IMAP server"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ + "/etc/imapd.conf" + "/etc/cyrus.conf" + ]; + + startLimitIntervalSec = 60; + environment = { + CYRUS_VERBOSE = mkIf cfg.debug "1"; + LISTENQUEUE = builtins.toString cfg.listenQueue; + }; + serviceConfig = { + User = if (cfg.user == null) then "cyrus" else cfg.user; + Group = if (cfg.group == null) then "cyrus" else cfg.group; + Type = "simple"; + ExecStart = "${cyrus-imapdPkg}/libexec/master -l $LISTENQUEUE -C /etc/imapd.conf -M /etc/cyrus.conf -p /run/cyrus/master.pid -D"; + Restart = "on-failure"; + RestartSec = "1s"; + RuntimeDirectory = "cyrus"; + StateDirectory = "cyrus"; + + # Hardening + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "full"; + CapabilityBoundingSet = [ "~CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE" ]; + MemoryDenyWriteExecute = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + }; + preStart = '' + mkdir -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock + ''; + }; + environment.systemPackages = [ cyrus-imapdPkg ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix deleted file mode 100644 index d273bba3e5..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.matrix-sliding-sync; -in -{ - imports = [ - (lib.mkRenamedOptionModule [ "services" "matrix-synapse" "sliding-sync" ] [ "services" "matrix-sliding-sync" ]) - ]; - - options.services.matrix-sliding-sync = { - enable = lib.mkEnableOption "sliding sync"; - - package = lib.mkPackageOption pkgs "matrix-sliding-sync" { }; - - settings = lib.mkOption { - type = lib.types.submodule { - freeformType = with lib.types; attrsOf str; - options = { - SYNCV3_SERVER = lib.mkOption { - type = lib.types.str; - description = '' - The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`. - ''; - }; - - SYNCV3_DB = lib.mkOption { - type = lib.types.str; - default = "postgresql:///matrix-sliding-sync?host=/run/postgresql"; - description = '' - The postgres connection string. - Refer to . - ''; - }; - - SYNCV3_BINDADDR = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1:8009"; - example = "[::]:8008"; - description = "The interface and port or path (for unix socket) to listen on."; - }; - - SYNCV3_LOG_LEVEL = lib.mkOption { - type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ]; - default = "info"; - description = "The level of verbosity for messages logged."; - }; - }; - }; - default = { }; - description = '' - Freeform environment variables passed to the sliding sync proxy. - Refer to for all supported values. - ''; - }; - - createDatabase = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync` - and the database `matrix-sliding-sync` exist. - ''; - }; - - environmentFile = lib.mkOption { - type = lib.types.str; - description = '' - Environment file as defined in {manpage}`systemd.exec(5)`. - - This must contain the {env}`SYNCV3_SECRET` variable which should - be generated with {command}`openssl rand -hex 32`. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - services.postgresql = lib.optionalAttrs cfg.createDatabase { - enable = true; - ensureDatabases = [ "matrix-sliding-sync" ]; - ensureUsers = [ { - name = "matrix-sliding-sync"; - ensureDBOwnership = true; - } ]; - }; - - systemd.services.matrix-sliding-sync = rec { - after = - lib.optional cfg.createDatabase "postgresql.service" - ++ lib.optional config.services.dendrite.enable "dendrite.service" - ++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit; - wants = after; - wantedBy = [ "multi-user.target" ]; - environment = cfg.settings; - serviceConfig = { - DynamicUser = true; - EnvironmentFile = cfg.environmentFile; - ExecStart = lib.getExe cfg.package; - StateDirectory = "matrix-sliding-sync"; - WorkingDirectory = "%S/matrix-sliding-sync"; - RuntimeDirectory = "matrix-sliding-sync"; - Restart = "on-failure"; - RestartSec = "1s"; - }; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix index e81b5d2b73..0bf326a193 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix @@ -7,6 +7,8 @@ in services.bazarr = { enable = lib.mkEnableOption "bazarr, a subtitle manager for Sonarr and Radarr"; + package = lib.mkPackageOption pkgs "bazarr" { }; + openFirewall = lib.mkOption { type = lib.types.bool; default = false; @@ -46,7 +48,7 @@ in StateDirectory = "bazarr"; SyslogIdentifier = "bazarr"; ExecStart = pkgs.writeShellScript "start-bazarr" '' - ${pkgs.bazarr}/bin/bazarr \ + ${cfg.package}/bin/bazarr \ --config '/var/lib/${StateDirectory}' \ --port ${toString cfg.listenPort} \ --no-update True diff --git a/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix b/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix index 99d5e3e180..76fc16020d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix @@ -96,7 +96,12 @@ in { extraConfig = lib.mkOption { description = '' - Docker extra registry configuration via environment variables. + Docker extra registry configuration. + ''; + example = lib.literalExpression '' + { + log.level = "debug"; + } ''; default = {}; type = lib.types.attrs; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index 0929b0ab51..6e18ef562b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -218,7 +218,6 @@ in { ps.psycopg2 ps.python-ldap ps.netdata-pandas - ps.changefinder ]); services.netdata.configDir.".opt-out-from-anonymous-statistics" = mkIf (!cfg.enableAnalyticsReporting) (pkgs.writeText ".opt-out-from-anonymous-statistics" ""); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix index da76ff5153..90a3993df6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix @@ -222,7 +222,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; restartTriggers = lib.optional (cfg.configFile != null) cfg.configFile; - path = lib.optional (lib.hasPrefix "if," cfg.use) pkgs.iproute2; + path = lib.optional (lib.hasPrefix "if," cfg.use || lib.hasPrefix "if," cfg.usev4 || lib.hasPrefix "if," cfg.usev6) pkgs.iproute2; serviceConfig = { DynamicUser = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall-iptables.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall-iptables.nix index e4fa7676fd..086106f0d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall-iptables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall-iptables.nix @@ -297,7 +297,6 @@ in } ]; - environment.systemPackages = [ pkgs.nixos-firewall-tool ]; networking.firewall.checkReversePath = lib.mkIf (!kernelHasRPFilter) (lib.mkDefault false); systemd.services.firewall = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix index f954a52841..06f070caf2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix @@ -81,6 +81,13 @@ in networking.nftables.tables."nixos-fw".family = "inet"; networking.nftables.tables."nixos-fw".content = '' + set temp-ports { + comment "Temporarily opened ports" + type inet_proto . inet_service + flags interval + auto-merge + } + ${lib.optionalString (cfg.checkReversePath != false) '' chain rpfilter { type filter hook prerouting priority mangle + 10; policy drop; @@ -147,6 +154,8 @@ in '' ) cfg.allInterfaces)} + meta l4proto . th dport @temp-ports accept + ${lib.optionalString cfg.allowPing '' icmp type echo-request ${lib.optionalString (cfg.pingLimit != null) "limit rate ${cfg.pingLimit}"} accept comment "allow ping" ''} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix index 27e17c464b..ab575b884a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix @@ -274,7 +274,10 @@ in networking.firewall.trustedInterfaces = [ "lo" ]; - environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages; + environment.systemPackages = [ + cfg.package + pkgs.nixos-firewall-tool + ] ++ cfg.extraPackages; boot.kernelModules = (lib.optional cfg.autoLoadConntrackHelpers "nf_conntrack") ++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/go-camo.nix b/third_party/nixpkgs/nixos/modules/services/networking/go-camo.nix index cb3b6eade4..adf80901cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/go-camo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/go-camo.nix @@ -55,7 +55,8 @@ in GOCAMO_HMAC_FILE = "%d/hmac"; }; script = '' - export GOCAMO_HMAC=$(cat "$GOCAMO_HMAC_FILE") + GOCAMO_HMAC="$(cat "$GOCAMO_HMAC_FILE")" + export GOCAMO_HMAC exec ${lib.escapeShellArgs(lib.lists.remove "" ([ "${pkgs.go-camo}/bin/go-camo" cfg.listen cfg.sslListen cfg.sslKey cfg.sslCert ] ++ cfg.extraOptions))} ''; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mihomo.nix b/third_party/nixpkgs/nixos/modules/services/networking/mihomo.nix index a425952b54..05d3d304d4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mihomo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mihomo.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "mihomo" { }; configFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + type = lib.types.path; description = "Configuration file to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shout.nix b/third_party/nixpkgs/nixos/modules/services/networking/shout.nix deleted file mode 100644 index 017b859019..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/shout.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; - -let - cfg = config.services.shout; - shoutHome = "/var/lib/shout"; - - defaultConfig = pkgs.runCommand "config.js" { preferLocalBuild = true; } '' - EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD - mv config.js $out - ''; - - finalConfigFile = if (cfg.configFile != null) then cfg.configFile else '' - var _ = require('${pkgs.shout}/lib/node_modules/shout/node_modules/lodash') - - module.exports = _.merge( - {}, - require('${defaultConfig}'), - ${builtins.toJSON cfg.config} - ) - ''; - -in { - options.services.shout = { - enable = mkEnableOption "Shout web IRC client"; - - private = mkOption { - type = types.bool; - default = false; - description = '' - Make your shout instance private. You will need to configure user - accounts by adding entries in {file}`${shoutHome}/users`. - ''; - }; - - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "IP interface to listen on for http connections."; - }; - - port = mkOption { - type = types.port; - default = 9000; - description = "TCP port to listen on for http connections."; - }; - - configFile = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Contents of Shout's {file}`config.js` file. - - Used for backward compatibility, recommended way is now to use - the `config` option. - - Documentation: http://shout-irc.com/docs/server/configuration.html - ''; - }; - - config = mkOption { - default = {}; - type = types.attrs; - example = { - displayNetwork = false; - defaults = { - name = "Your Network"; - host = "localhost"; - port = 6697; - }; - }; - description = '' - Shout {file}`config.js` contents as attribute set (will be - converted to JSON to generate the configuration file). - - The options defined here will be merged to the default configuration file. - - Documentation: http://shout-irc.com/docs/server/configuration.html - ''; - }; - }; - - config = mkIf cfg.enable { - users.users.shout = { - isSystemUser = true; - group = "shout"; - description = "Shout daemon user"; - home = shoutHome; - createHome = true; - }; - users.groups.shout = {}; - - systemd.services.shout = { - description = "Shout web IRC client"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - preStart = "ln -sf ${pkgs.writeText "config.js" finalConfigFile} ${shoutHome}/config.js"; - script = concatStringsSep " " [ - "${pkgs.shout}/bin/shout" - (if cfg.private then "--private" else "--public") - "--port" (toString cfg.port) - "--host" (toString cfg.listenAddress) - "--home" shoutHome - ]; - serviceConfig = { - User = "shout"; - ProtectHome = "true"; - ProtectSystem = "full"; - PrivateTmp = "true"; - }; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sing-box.nix b/third_party/nixpkgs/nixos/modules/services/networking/sing-box.nix index 9f09e528e7..1eadeaf4cb 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sing-box.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sing-box.nix @@ -55,11 +55,17 @@ in systemd.packages = [ cfg.package ]; systemd.services.sing-box = { - preStart = '' - umask 0077 - mkdir -p /etc/sing-box - ${utils.genJqSecretsReplacementSnippet cfg.settings "/etc/sing-box/config.json"} - ''; + preStart = utils.genJqSecretsReplacementSnippet cfg.settings "/run/sing-box/config.json"; + serviceConfig = { + StateDirectory = "sing-box"; + StateDirectoryMode = "0700"; + RuntimeDirectory = "sing-box"; + RuntimeDirectoryMode = "0700"; + ExecStart = [ + "" + "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run" + ]; + }; wantedBy = [ "multi-user.target" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix index d9c314f5ec..f96853939b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -375,8 +375,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ - erictapen - nh2 - ]; + meta.maintainers = with lib.maintainers; [ nh2 ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 859da5be81..aaff9221d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -57,6 +57,7 @@ in { example = "/run/secrets/tailscale_key"; description = '' A file containing the auth key. + Tailscale will be automatically started if provided. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix index cf2fffac3f..845a6703dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix @@ -979,7 +979,6 @@ in }; meta.maintainers = with lib.maintainers; [ - erictapen Flakebi oddlama ]; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/bitmagnet.nix b/third_party/nixpkgs/nixos/modules/services/torrent/bitmagnet.nix new file mode 100644 index 0000000000..c0929b69f4 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/torrent/bitmagnet.nix @@ -0,0 +1,194 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.services.bitmagnet; + inherit (lib) + mkEnableOption + mkIf + mkOption + mkPackageOption + optional + ; + inherit (lib.types) + bool + int + port + str + submodule + ; + inherit (lib.generators) toYAML; + + freeformType = (pkgs.formats.yaml { }).type; +in +{ + options.services.bitmagnet = { + enable = mkEnableOption "Bitmagnet service"; + useLocalPostgresDB = mkOption { + description = "Use a local postgresql database, create user and database"; + type = bool; + default = true; + }; + settings = mkOption { + description = "Bitmagnet configuration (https://bitmagnet.io/setup/configuration.html)."; + default = { }; + type = submodule { + inherit freeformType; + options = { + http_server = mkOption { + default = { }; + description = "HTTP server settings"; + type = submodule { + inherit freeformType; + options = { + port = mkOption { + type = str; + default = ":3333"; + description = "HTTP server listen port"; + }; + }; + }; + }; + dht_server = mkOption { + default = { }; + description = "DHT server settings"; + type = submodule { + inherit freeformType; + options = { + port = mkOption { + type = port; + default = 3334; + description = "DHT listen port"; + }; + }; + }; + }; + postgres = mkOption { + default = { }; + description = "PostgreSQL database configuration"; + type = submodule { + inherit freeformType; + options = { + host = mkOption { + type = str; + default = ""; + description = "Address, hostname or Unix socket path of the database server"; + }; + name = mkOption { + type = str; + default = "bitmagnet"; + description = "Database name to connect to"; + }; + user = mkOption { + type = str; + default = ""; + description = "User to connect as"; + }; + password = mkOption { + type = str; + default = ""; + description = "Password for database user"; + }; + }; + }; + }; + }; + }; + }; + package = mkPackageOption pkgs "bitmagnet" { }; + user = mkOption { + description = "User running bitmagnet"; + type = str; + default = "bitmagnet"; + }; + group = mkOption { + description = "Group of user running bitmagnet"; + type = str; + default = "bitmagnet"; + }; + openFirewall = mkOption { + description = "Open DHT ports in firewall"; + type = bool; + default = false; + }; + }; + config = mkIf cfg.enable { + environment.etc."xdg/bitmagnet/config.yml" = { + text = toYAML { } cfg.settings; + mode = "0440"; + user = cfg.user; + group = cfg.group; + }; + systemd.services.bitmagnet = { + enable = true; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + ] ++ optional cfg.useLocalPostgresDB "postgresql.service"; + requires = optional cfg.useLocalPostgresDB "postgresql.service"; + serviceConfig = { + Type = "simple"; + DynamicUser = true; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/bitmagnet worker run --all"; + Restart = "on-failure"; + WorkingDirectory = "/var/lib/bitmagnet"; + StateDirectory = "bitmagnet"; + + # Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html) + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + }; + }; + users.users = mkIf (cfg.user == "bitmagnet") { + bitmagnet = { + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = mkIf (cfg.group == "bitmagnet") { bitmagnet = { }; }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.dht_server.port ]; + allowedUDPPorts = [ cfg.settings.dht_server.port ]; + }; + services.postgresql = mkIf cfg.useLocalPostgresDB { + enable = true; + ensureDatabases = [ + cfg.settings.postgres.name + (if (cfg.settings.postgres.user == "") then cfg.user else cfg.settings.postgres.user) + ]; + ensureUsers = [ + { + name = if (cfg.settings.postgres.user == "") then cfg.user else cfg.settings.postgres.user; + ensureDBOwnership = true; + } + ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ gileri ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/video/wivrn.nix b/third_party/nixpkgs/nixos/modules/services/video/wivrn.nix new file mode 100644 index 0000000000..f571832053 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/video/wivrn.nix @@ -0,0 +1,226 @@ +{ + config, + pkgs, + lib, + ... +}: +let + inherit (lib) + mkIf + mkEnableOption + mkPackageOption + mkOption + optionalString + optionalAttrs + isDerivation + recursiveUpdate + getExe + literalExpression + types + maintainers + ; + cfg = config.services.wivrn; + configFormat = pkgs.formats.json { }; + + # For the application option to work with systemd PATH, we find the store binary path of + # the package, concat all of the following strings, and then update the application attribute. + # Application can either be a package or a list that has a package as the first element. + applicationExists = builtins.hasAttr "application" cfg.config.json; + applicationListNotEmpty = ( + if builtins.isList cfg.config.json.application then + (builtins.length cfg.config.json.application) != 0 + else + true + ); + applicationCheck = applicationExists && applicationListNotEmpty; + + applicationBinary = ( + if builtins.isList cfg.config.json.application then + builtins.head cfg.config.json.application + else + cfg.config.json.application + ); + applicationStrings = builtins.tail cfg.config.json.application; + + applicationPath = mkIf applicationCheck applicationBinary; + + applicationConcat = ( + if builtins.isList cfg.config.json.application then + builtins.concatStringsSep " " ([ (getExe applicationBinary) ] ++ applicationStrings) + else + (getExe applicationBinary) + ); + applicationUpdate = recursiveUpdate cfg.config.json ( + optionalAttrs applicationCheck { application = applicationConcat; } + ); + configFile = configFormat.generate "config.json" applicationUpdate; +in +{ + options = { + services.wivrn = { + enable = mkEnableOption "WiVRn, an OpenXR streaming application"; + + package = mkPackageOption pkgs "wivrn" { }; + + openFirewall = mkEnableOption "the default ports in the firewall for the WiVRn server"; + + defaultRuntime = mkEnableOption '' + WiVRn Monado as the default OpenXR runtime on the system. + The config can be found at `/etc/xdg/openxr/1/active_runtime.json`. + + Note that applications can bypass this option by setting an active + runtime in a writable XDG_CONFIG_DIRS location like `~/.config` + ''; + + autoStart = mkEnableOption "starting the service by default"; + + monadoEnvironment = mkOption { + type = types.attrs; + description = "Environment variables to be passed to the Monado environment."; + default = { + XRT_COMPOSITOR_LOG = "debug"; + XRT_PRINT_OPTIONS = "on"; + IPC_EXIT_ON_DISCONNECT = "off"; + }; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + description = "Packages to add to the wivrn-application service $PATH."; + default = [ ]; + example = literalExpression "[ pkgs.bash pkgs.procps ]"; + }; + + config = { + enable = mkEnableOption "configuration for WiVRn"; + json = mkOption { + type = configFormat.type; + description = '' + Configuration for WiVRn. The attributes are serialized to JSON in config.json. + + Note that the application option must be either a package or a + list with package as the first element. + + See https://github.com/Meumeu/WiVRn/blob/master/docs/configuration.md + ''; + default = { }; + example = literalExpression '' + { + scale = 0.8; + bitrate = 100000000; + encoders = [ + { + encoder = "nvenc"; + codec = "h264"; + width = 1.0; + height = 1.0; + offset_x = 0.0; + offset_y = 0.0; + } + ]; + application = [ pkgs.wlx-overlay-s ]; + tcp_only = true; + } + ''; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !applicationCheck || isDerivation applicationBinary; + message = "The application in WiVRn configuration is not a package. Please ensure that the application is a package or that a package is the first element in the list."; + } + ]; + + systemd.user = { + services = { + # The WiVRn server runs in a hardened service and starts the applications in a different service + wivrn = { + description = "WiVRn XR runtime service"; + environment = { + # Default options + # https://gitlab.freedesktop.org/monado/monado/-/blob/598080453545c6bf313829e5780ffb7dde9b79dc/src/xrt/targets/service/monado.in.service#L12 + XRT_COMPOSITOR_LOG = "debug"; + XRT_PRINT_OPTIONS = "on"; + IPC_EXIT_ON_DISCONNECT = "off"; + } // cfg.monadoEnvironment; + serviceConfig = { + ExecStart = ( + (getExe cfg.package) + " --systemd" + optionalString cfg.config.enable " -f ${configFile}" + ); + # Hardening options + CapabilityBoundingSet = [ "CAP_SYS_NICE" ]; + AmbientCapabilities = [ "CAP_SYS_NICE" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + }; + wantedBy = mkIf cfg.autoStart [ "default.target" ]; + restartTriggers = [ + cfg.package + configFile + ]; + }; + wivrn-application = mkIf applicationCheck { + description = "WiVRn application service"; + requires = [ "wivrn.service" ]; + serviceConfig = { + ExecStart = ( + (getExe cfg.package) + " --application" + optionalString cfg.config.enable " -f ${configFile}" + ); + Restart = "on-failure"; + RestartSec = 0; + PrivateTmp = true; + }; + # We need to add the application to PATH so WiVRn can find it + path = [ applicationPath ] ++ cfg.extraPackages; + }; + }; + }; + + services = { + # WiVRn can be used with some wired headsets so we include xr-hardware + udev.packages = with pkgs; [ + android-udev-rules + xr-hardware + ]; + avahi = { + enable = true; + publish = { + enable = true; + userServices = true; + }; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 9757 ]; + allowedUDPPorts = [ 9757 ]; + }; + + environment = { + systemPackages = [ + cfg.package + applicationPath + ]; + pathsToLink = [ "/share/openxr" ]; + etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime { + source = "${cfg.package}/share/openxr/1/openxr_wivrn.json"; + }; + }; + }; + meta.maintainers = with maintainers; [ passivelemon ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix index 4da5aff0c8..961178cedc 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -77,15 +77,21 @@ in dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype; dbUser = lib.optionalString (cfg.dbuser != null) cfg.dbuser; dbPass = lib.optionalString (cfg.dbpassFile != null) ":$DATABASE_PASSWORD"; - isSocket = lib.hasPrefix "/" (toString cfg.dbhost); + dbHostHasPrefix = prefix: lib.hasPrefix prefix (toString cfg.dbhost); + isPostgresql = dbType == "postgresql"; + isMysql = dbType == "mysql"; + isSocket = (isPostgresql && dbHostHasPrefix "/") || (isMysql && dbHostHasPrefix "localhost:/"); dbHost = lib.optionalString (cfg.dbhost != null) (if isSocket then - if dbType == "postgresql" then "?host=${cfg.dbhost}" else - if dbType == "mysql" then "?socket=${cfg.dbhost}" else throw "unsupported dbtype" + lib.optionalString isMysql "@localhost" else "@${cfg.dbhost}"); + dbOpts = lib.optionalString (cfg.dbhost != null && isSocket) ( + if isPostgresql then "?host=${cfg.dbhost}" else + if isMysql then "?socket=${lib.removePrefix "localhost:" cfg.dbhost}" else throw "unsupported dbtype" + ); dbName = lib.optionalString (cfg.dbname != null) "/${cfg.dbname}"; - dbUrl = "${dbType}://${dbUser}${dbPass}${lib.optionalString (!isSocket) dbHost}${dbName}${lib.optionalString isSocket dbHost}"; + dbUrl = "${dbType}://${dbUser}${dbPass}${dbHost}${dbName}${dbOpts}"; in lib.optionalString (dbPass != "") '' export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")" '' + '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix new file mode 100644 index 0000000000..ff95f54506 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-whiteboard-server.nix @@ -0,0 +1,72 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + + inherit (lib) + mkIf + mkEnableOption + mkOption + types + literalExpression + ; + cfg = config.services.nextcloud-whiteboard-server; + +in +{ + options.services.nextcloud-whiteboard-server = { + + enable = mkEnableOption "Nextcloud backend server for the Whiteboard app"; + + settings = mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Settings to configure backend server. Especially the Nextcloud host + url has to be set. The required environment variable `JWT_SECRET_KEY` + should be set via the secrets option. + ''; + example = literalExpression '' + { + NEXTCLOUD_URL = "https://nextcloud.example.org"; + } + ''; + }; + + secrets = lib.mkOption { + type = with types; listOf str; + description = '' + A list of files containing the various secrets. Should be in the + format expected by systemd's `EnvironmentFile` directory. + ''; + default = [ ]; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.nextcloud-whiteboard-server = { + description = "Nextcloud backend server for the Whiteboard app"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + environment = cfg.settings; + serviceConfig = { + ExecStart = "${lib.getExe pkgs.nextcloud-whiteboard-server}"; + WorkingDirectory = "%S/whiteboard"; + StateDirectory = "whiteboard"; + EnvironmentFile = [ cfg.secrets ]; + DynamicUser = true; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ onny ]; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index fcaca9244c..8cb4b4c439 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -930,7 +930,10 @@ in { nextcloud-setup = let c = cfg.config; occInstallCmd = let - mkExport = { arg, value }: "export ${arg}=${value}"; + mkExport = { arg, value }: '' + ${arg}=${value}; + export ${arg}; + ''; dbpass = { arg = "DBPASS"; value = if c.dbpassFile != null diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix index 35af8c2648..89952f09c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix @@ -22,7 +22,6 @@ let ] ++ finalPackage.optional-dependencies.redis ++ lib.optionals cfg.celery.enable [ celery ] - ++ lib.optionals (cfg.settings.database.backend == "mysql") finalPackage.optional-dependencies.mysql ++ lib.optionals (cfg.settings.database.backend == "postgresql") finalPackage.optional-dependencies.postgres; }; in @@ -184,6 +183,17 @@ in }; }; + files = { + upload_limit = lib.mkOption { + type = lib.types.ints.positive; + default = 10; + example = 50; + description = '' + Maximum file upload size in MiB. + ''; + }; + }; + filesystem = { data = lib.mkOption { type = lib.types.path; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wakapi.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wakapi.nix index a38df9c887..982b572fb2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wakapi.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wakapi.nix @@ -66,6 +66,60 @@ in The path to a file containing the password for the smtp mailer used by Wakapi. ''; }; + + database = { + createLocally = mkEnableOption '' + automatic database configuration. + + ::: {.note} + Only PostgreSQL is supported for the time being. + ::: + ''; + + dialect = mkOption { + type = types.nullOr ( + types.enum [ + "postgres" + "sqlite3" + "mysql" + "cockroach" + "mssql" + ] + ); + default = cfg.settings.db.dialect or null; # handle case where dialect is not set + defaultText = '' + Database dialect from settings if {option}`services.wakatime.settings.db.dialect` + is set, or `null` otherwise. + ''; + description = '' + The database type to use for Wakapi. + ''; + }; + + name = mkOption { + type = types.str; + default = cfg.settings.db.name or "wakapi"; + defaultText = '' + Database name from settings if {option}`services.wakatime.settings.db.name` + is set, or "wakapi" otherwise. + ''; + description = '' + The name of the database to use for Wakapi. + ''; + }; + + user = mkOption { + type = types.str; + default = cfg.settings.db.user or "wakapi"; + defaultText = '' + User from settings if {option}`services.wakatime.settings.db.user` + is set, or "wakapi" otherwise. + ''; + description = '' + The name of the user to use for Wakapi. + ''; + }; + }; }; config = mkIf cfg.enable { @@ -73,10 +127,10 @@ in description = "Wakapi (self-hosted WakaTime-compatible backend)"; wants = [ "network-online.target" - ] ++ optional (cfg.settings.db.dialect == "postgres") "postgresql.service"; + ] ++ optional (cfg.database.dialect == "postgres") "postgresql.service"; after = [ "network-online.target" - ] ++ optional (cfg.settings.db.dialect == "postgres") "postgresql.service"; + ] ++ optional (cfg.database.dialect == "postgres") "postgresql.service"; wantedBy = [ "multi-user.target" ]; script = '' @@ -128,13 +182,26 @@ in message = "Either `services.wakapi.passwordSalt` or `services.wakapi.passwordSaltFile` must be set."; } { - assertion = cfg.passwordSalt != null -> cfg.passwordSaltFile != null; + assertion = !(cfg.passwordSalt != null && cfg.passwordSaltFile != null); message = "Both `services.wakapi.passwordSalt` `services.wakapi.passwordSaltFile` should not be set at the same time."; } { - assertion = cfg.smtpPassword != null -> cfg.smtpPasswordFile != null; + assertion = !(cfg.smtpPassword != null && cfg.smtpPasswordFile != null); message = "Both `services.wakapi.smtpPassword` `services.wakapi.smtpPasswordFile` should not be set at the same time."; } + { + assertion = cfg.database.createLocally -> cfg.settings.db.dialect != null; + message = "`services.wakapi.database.createLocally` is true, but a database dialect is not set!"; + } + ]; + + warnings = [ + (lib.optionalString (cfg.database.createLocally -> cfg.settings.db.dialect != "postgres") '' + You have enabled automatic database configuration, but the database dialect is not set to "posgres". + + The Wakapi module only supports for PostgreSQL. Please set `services.wakapi.database.createLocally` + to `false`, or switch to "postgres" as your database dialect. + '') ]; users = { @@ -146,10 +213,10 @@ in groups.wakapi = { }; }; - services.postgresql = mkIf (cfg.settings.db.dialect == "postgres") { + services.postgresql = mkIf (cfg.database.createLocally && cfg.database.dialect == "postgres") { enable = true; - ensureDatabases = singleton cfg.settings.db.name; + ensureDatabases = singleton cfg.database.name; ensureUsers = singleton { name = cfg.settings.db.user; ensureDBOwnership = true; @@ -161,5 +228,8 @@ in }; }; - meta.maintainers = with lib.maintainers; [ isabelroses ]; + meta.maintainers = with lib.maintainers; [ + isabelroses + NotAShelf + ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 1a58662ada..af7885c30a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -1150,14 +1150,6 @@ in ''; } - { - assertion = any (host: host.rejectSSL) (attrValues virtualHosts) -> versionAtLeast cfg.package.version "1.19.4"; - message = '' - services.nginx.virtualHosts..rejectSSL requires nginx version - 1.19.4 or above; see the documentation for services.nginx.package. - ''; - } - { assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts); message = '' diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 6490dc99d6..85fcbb83ce 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -74,8 +74,6 @@ let netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi; - edk2-uefi-shell = optionalString cfg.edk2-uefi-shell.enable pkgs.edk2-uefi-shell; - checkMountpoints = pkgs.writeShellScript "check-mountpoints" '' fail() { echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2 diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix index 31222d553a..48eb4528a2 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix @@ -1,5 +1,10 @@ # Module for VirtualBox guests. -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.virtualbox.guest; kernel = config.boot.kernelPackages; @@ -28,7 +33,20 @@ let in { imports = [ - (lib.mkRenamedOptionModule [ "virtualisation" "virtualbox" "guest" "draganddrop" ] [ "virtualisation" "virtualbox" "guest" "dragAndDrop" ]) + (lib.mkRenamedOptionModule + [ + "virtualisation" + "virtualbox" + "guest" + "draganddrop" + ] + [ + "virtualisation" + "virtualbox" + "guest" + "dragAndDrop" + ] + ) ]; options.virtualisation.virtualbox.guest = { @@ -59,36 +77,38 @@ in ###### implementation - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - assertions = [{ - assertion = pkgs.stdenv.hostPlatform.isx86; - message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; - }]; + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + assertions = [ + { + assertion = pkgs.stdenv.hostPlatform.isx86; + message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; + } + ]; - environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; + environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; - boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; + boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; - boot.supportedFilesystems = [ "vboxsf" ]; - boot.initrd.supportedFilesystems = [ "vboxsf" ]; + boot.supportedFilesystems = [ "vboxsf" ]; + boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.groups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; - systemd.services.virtualbox = { - description = "VirtualBox Guest Services"; + systemd.services.virtualbox = { + description = "VirtualBox Guest Services"; - wantedBy = [ "multi-user.target" ]; - requires = [ "dev-vboxguest.device" ]; - after = [ "dev-vboxguest.device" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "dev-vboxguest.device" ]; + after = [ "dev-vboxguest.device" ]; - unitConfig.ConditionVirtualization = "oracle"; + unitConfig.ConditionVirtualization = "oracle"; - serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; - }; + serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; + }; - services.udev.extraRules = - '' + services.udev.extraRules = '' # /dev/vboxuser is necessary for VBoxClient to work. Maybe we # should restrict this to logged-in users. KERNEL=="vboxuser", OWNER="root", GROUP="root", MODE="0666" @@ -97,22 +117,17 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; - systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; - } - ( - lib.mkIf cfg.clipboard { + systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; + } + (lib.mkIf cfg.clipboard { systemd.user.services.virtualboxClientClipboard = mkVirtualBoxUserService "--clipboard"; - } - ) - ( - lib.mkIf cfg.seamless { + }) + (lib.mkIf cfg.seamless { systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserService "--seamless"; - } - ) - ( - lib.mkIf cfg.dragAndDrop { + }) + (lib.mkIf cfg.dragAndDrop { systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop"; - } - ) - ]); + }) + ] + ); } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix index 8820b4ff5a..29e2d4340f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix @@ -1,9 +1,19 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.virtualbox.host; virtualbox = cfg.package.override { - inherit (cfg) enableHardening headless enableWebService enableKvm; + inherit (cfg) + enableHardening + headless + enableWebService + enableKvm + ; extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; @@ -93,93 +103,119 @@ in }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [{ - warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) - ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; - environment.systemPackages = [ virtualbox ]; - - security.wrappers = let - mkSuid = program: { - source = "${virtualbox}/libexec/virtualbox/${program}"; - owner = "root"; - group = "vboxusers"; - setuid = true; - }; - executables = [ - "VBoxHeadless" - "VBoxNetAdpCtl" - "VBoxNetDHCP" - "VBoxNetNAT" - "VBoxVolInfo" - ] ++ (lib.optionals (!cfg.headless) [ - "VBoxSDL" - "VirtualBoxVM" - ]); - in lib.mkIf cfg.enableHardening - (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables)); - - users.groups.vboxusers.gid = config.ids.gids.vboxusers; - - services.udev.extraRules = - '' - SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - ''; - } (lib.mkIf cfg.enableKvm { - assertions = [ + config = lib.mkIf cfg.enable ( + lib.mkMerge [ { - assertion = !cfg.addNetworkInterface; - message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; + warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) [ + "'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'" + ]; + environment.systemPackages = [ virtualbox ]; + + security.wrappers = + let + mkSuid = program: { + source = "${virtualbox}/libexec/virtualbox/${program}"; + owner = "root"; + group = "vboxusers"; + setuid = true; + }; + executables = + [ + "VBoxHeadless" + "VBoxNetAdpCtl" + "VBoxNetDHCP" + "VBoxNetNAT" + "VBoxVolInfo" + ] + ++ (lib.optionals (!cfg.headless) [ + "VBoxSDL" + "VirtualBoxVM" + ]); + in + lib.mkIf cfg.enableHardening ( + builtins.listToAttrs ( + map (x: { + name = x; + value = mkSuid x; + }) executables + ) + ); + + users.groups.vboxusers.gid = config.ids.gids.vboxusers; + + services.udev.extraRules = '' + SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + ''; } - ]; - }) (lib.mkIf (!cfg.enableKvm) { - boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ kernelModules ]; + (lib.mkIf cfg.enableKvm { + assertions = [ + { + assertion = !cfg.addNetworkInterface; + message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; + } + ]; + }) + (lib.mkIf (!cfg.enableKvm) { + boot.kernelModules = [ + "vboxdrv" + "vboxnetadp" + "vboxnetflt" + ]; + boot.extraModulePackages = [ kernelModules ]; - services.udev.extraRules = - '' - KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" - KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - ''; + services.udev.extraRules = '' + KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" + KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + ''; - # Since we lack the right setuid/setcap binaries, set up a host-only network by default. - }) (lib.mkIf cfg.addNetworkInterface { - systemd.services.vboxnet0 = - { description = "VirtualBox vboxnet0 Interface"; - requires = [ "dev-vboxnetctl.device" ]; - after = [ "dev-vboxnetctl.device" ]; - wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ]; - path = [ virtualbox ]; - serviceConfig.RemainAfterExit = true; - serviceConfig.Type = "oneshot"; - serviceConfig.PrivateTmp = true; - environment.VBOX_USER_HOME = "/tmp"; - script = - '' + # Since we lack the right setuid/setcap binaries, set up a host-only network by default. + }) + (lib.mkIf cfg.addNetworkInterface { + systemd.services.vboxnet0 = { + description = "VirtualBox vboxnet0 Interface"; + requires = [ "dev-vboxnetctl.device" ]; + after = [ "dev-vboxnetctl.device" ]; + wantedBy = [ + "network.target" + "sys-subsystem-net-devices-vboxnet0.device" + ]; + path = [ virtualbox ]; + serviceConfig.RemainAfterExit = true; + serviceConfig.Type = "oneshot"; + serviceConfig.PrivateTmp = true; + environment.VBOX_USER_HOME = "/tmp"; + script = '' if ! [ -e /sys/class/net/vboxnet0 ]; then VBoxManage hostonlyif create cat /tmp/VBoxSVC.log >&2 fi ''; - postStop = - '' + postStop = '' VBoxManage hostonlyif remove vboxnet0 ''; - }; + }; - networking.interfaces.vboxnet0.ipv4.addresses = [{ address = "192.168.56.1"; prefixLength = 24; }]; - # Make sure NetworkManager won't assume this interface being up - # means we have internet access. - networking.networkmanager.unmanaged = ["vboxnet0"]; - }) (lib.mkIf config.networking.useNetworkd { - systemd.network.networks."40-vboxnet0".extraConfig = '' - [Link] - RequiredForOnline=no - ''; - }) + networking.interfaces.vboxnet0.ipv4.addresses = [ + { + address = "192.168.56.1"; + prefixLength = 24; + } + ]; + # Make sure NetworkManager won't assume this interface being up + # means we have internet access. + networking.networkmanager.unmanaged = [ "vboxnet0" ]; + }) + (lib.mkIf config.networking.useNetworkd { + systemd.network.networks."40-vboxnet0".extraConfig = '' + [Link] + RequiredForOnline=no + ''; + }) -]); + ] + ); } diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 8ddcc779ea..fb85df8808 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -245,6 +245,7 @@ in { curl-impersonate = handleTest ./curl-impersonate.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; + cyrus-imap = runTest ./cyrus-imap.nix; darling = handleTest ./darling.nix {}; darling-dmg = runTest ./darling-dmg.nix; dae = handleTest ./dae.nix {}; @@ -928,6 +929,7 @@ in { sourcehut = handleTest ./sourcehut {}; spacecookie = handleTest ./spacecookie.nix {}; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; + spiped = runTest ./spiped.nix; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; ssh-agent-auth = handleTest ./ssh-agent-auth.nix {}; @@ -1106,6 +1108,7 @@ in { vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {}; vscodium = discoverTests (import ./vscodium.nix); vsftpd = handleTest ./vsftpd.nix {}; + wakapi = handleTest ./wakapi.nix {}; warzone2100 = handleTest ./warzone2100.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wastebin = handleTest ./wastebin.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/cyrus-imap.nix b/third_party/nixpkgs/nixos/tests/cyrus-imap.nix new file mode 100644 index 0000000000..36145ed474 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/cyrus-imap.nix @@ -0,0 +1,120 @@ +{ lib, pkgs, ... }: +{ + name = "cyrus-imap"; + + meta = { + maintainers = with lib.maintainers; [ moraxyc ]; + }; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + curl + sudo + ]; + services.saslauthd = { + enable = true; + config = '' + DESC="SASL Authentication Daemon" + NAME="saslauthd" + MECH_OPTIONS="" + THREADS=5 + START=yes + OPTIONS="-c -m /run/saslauthd" + ''; + }; + services.cyrus-imap = { + enable = true; + cyrusSettings = { + START = { + recover = { + cmd = [ + "ctl_cyrusdb" + "-r" + ]; + }; + }; + EVENTS = { + tlsprune = { + cmd = [ "tls_prune" ]; + at = 400; + }; + delprune = { + cmd = [ + "cyr_expire" + "-E" + "3" + ]; + at = 400; + }; + deleteprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-D" + "28" + ]; + at = 430; + }; + expungeprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-X" + "28" + ]; + at = 445; + }; + checkpoint = { + cmd = [ + "ctl_cyrusdb" + "-c" + ]; + period = 30; + }; + }; + SERVICES = { + http = { + cmd = [ "httpd" ]; + listen = "80"; + prefork = 0; + }; + imap = { + cmd = [ "imapd" ]; + listen = "143"; + prefork = 0; + }; + lmtpunix = { + cmd = [ "lmtpd" ]; + listen = "/run/cyrus/lmtp"; + prefork = 0; + }; + notify = { + cmd = [ "notifyd" ]; + listen = "/run/cyrus/notify"; + proto = "udp"; + prefork = 0; + }; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("saslauthd.service") + machine.wait_for_unit("cyrus-imap.service") + + machine.wait_for_open_port(80) + machine.wait_for_open_port(143) + + machine.succeed("echo 'secret' | ${lib.getExe' pkgs.cyrus_sasl.bin "saslpasswd2"} -p -c cyrus") + machine.succeed("chown cyrus /etc/sasldb2") + + machine.succeed("sudo -ucyrus curl --fail --max-time 10 imap://cyrus:secret@localhost:143") + machine.fail("curl --fail --max-time 10 imap://cyrus:wrongsecret@localhost:143") + machine.fail("curl --fail --max-time 10 -X PROPFIND -H 'Depth: 1' 'http://localhost/dav/addressbooks/user/cyrus@localhost/Default'") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/firewall.nix b/third_party/nixpkgs/nixos/tests/firewall.nix index 139bc31177..89f4878fd4 100644 --- a/third_party/nixpkgs/nixos/tests/firewall.nix +++ b/third_party/nixpkgs/nixos/tests/firewall.nix @@ -3,14 +3,31 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : { name = "firewall" + pkgs.lib.optionalString nftables "-nftables"; meta = with pkgs.lib.maintainers; { - maintainers = [ ]; + maintainers = [ rvfg garyguo ]; }; nodes = { walled = { ... }: - { networking.firewall.enable = true; - networking.firewall.logRefusedPackets = true; + { networking.firewall = { + enable = true; + logRefusedPackets = true; + # Syntax smoke test, not actually verified otherwise + allowedTCPPorts = [ 25 993 8005 ]; + allowedTCPPortRanges = [ + { from = 980; to = 1000; } + { from = 990; to = 1010; } + { from = 8000; to = 8010; } + ]; + interfaces.eth0 = { + allowedTCPPorts = [ 10003 ]; + allowedTCPPortRanges = [ { from = 10000; to = 10005; } ]; + }; + interfaces.eth3 = { + allowedUDPPorts = [ 10003 ]; + allowedUDPPortRanges = [ { from = 10000; to = 10005; } ]; + }; + }; networking.nftables.enable = nftables; services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; @@ -48,6 +65,14 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : { walled.succeed("curl -v http://attacker/ >&2") walled.succeed("ping -c 1 attacker >&2") + # Open tcp port 80 at runtime + walled.succeed("nixos-firewall-tool open tcp 80") + attacker.succeed("curl -v http://walled/ >&2") + + # Reset the firewall + walled.succeed("nixos-firewall-tool reset") + attacker.fail("curl --fail --connect-timeout 2 http://walled/ >&2") + # If we stop the firewall, then connections should succeed. walled.stop_job("${unit}") attacker.succeed("curl -v http://walled/ >&2") diff --git a/third_party/nixpkgs/nixos/tests/kanidm.nix b/third_party/nixpkgs/nixos/tests/kanidm.nix index 7e2fce2085..5cb298fe92 100644 --- a/third_party/nixpkgs/nixos/tests/kanidm.nix +++ b/third_party/nixpkgs/nixos/tests/kanidm.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "kanidm"; - meta.maintainers = with pkgs.lib.maintainers; [ erictapen Flakebi oddlama ]; + meta.maintainers = with pkgs.lib.maintainers; [ Flakebi oddlama ]; nodes.server = { pkgs, ... }: { services.kanidm = { diff --git a/third_party/nixpkgs/nixos/tests/keymap.nix b/third_party/nixpkgs/nixos/tests/keymap.nix index e8973a50f8..3542dea58f 100644 --- a/third_party/nixpkgs/nixos/tests/keymap.nix +++ b/third_party/nixpkgs/nixos/tests/keymap.nix @@ -11,15 +11,15 @@ let testReader = pkgs.writeScript "test-input-reader" '' rm -f ${resultFile} ${resultFile}.tmp - logger "testReader: START: Waiting for $1 characters, expecting '$2'." + logger "testReader: START: expecting '$1'." touch ${readyFile} - read -r -N $1 chars + read -r -N ''${#1} -t 60 chars rm -f ${readyFile} - if [ "$chars" == "$2" ]; then - logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp + if [ "$chars" == "$1" ]; then + logger -s "testReader: PASS: Got '$1' as expected." 2>${resultFile}.tmp else - logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp + logger -s "testReader: FAIL: Expected '$1' but got '$chars'." 2>${resultFile}.tmp fi # rename after the file is written to prevent a race condition mv ${resultFile}.tmp ${resultFile} @@ -39,39 +39,29 @@ let import shlex - def run_test_case(cmd, xorg_keymap, test_case_name, inputs, expected): - with subtest(test_case_name): - assert len(inputs) == len(expected) - machine.execute("rm -f ${readyFile} ${resultFile}") + def run_test_case(cmd, inputs, expected): + assert len(inputs) == len(expected) + machine.execute("rm -f ${readyFile} ${resultFile}") - # set up process that expects all the keys to be entered - machine.succeed( - "{} {} {} {} >&2 &".format( - cmd, - "${testReader}", - len(inputs), - shlex.quote("".join(expected)), - ) + # set up process that expects all the keys to be entered + machine.succeed( + "${pkgs.systemd}/bin/systemd-cat -t input-test-reader -- {} {} {} &".format( + cmd, + "${testReader}", + shlex.quote("".join(expected)), ) + ) - if xorg_keymap: - # make sure the xterm window is open and has focus - machine.wait_for_window("testterm") - machine.wait_until_succeeds( - "${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible " - "--class testterm windowfocus --sync" - ) + # wait for reader to be ready + machine.wait_for_file("${readyFile}") - # wait for reader to be ready - machine.wait_for_file("${readyFile}") + # send all keys + for key in inputs: + machine.send_key(key) - # send all keys - for key in inputs: - machine.send_key(key) - - # wait for result and check - machine.wait_for_file("${resultFile}") - machine.succeed("grep -q 'PASS:' ${resultFile}") + # wait for result and check + machine.wait_for_file("${resultFile}") + machine.succeed("grep -q 'PASS:' ${resultFile}") with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file: @@ -87,19 +77,17 @@ let # fighting over the virtual terminal. This does not appear to be a problem # when the X test runs first. keymap_environments = { - "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", - "VT Keymap": "openvt -sw --", + "Xorg Keymap": "env DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", + "VT Keymap": "openvt -c 2 -sw --", } machine.wait_for_x() - for keymap_env_name, command in keymap_environments.items(): - with subtest(keymap_env_name): - for test_case_name, test_data in tests.items(): + for test_case_name, test_data in tests.items(): + for keymap_env_name, command in keymap_environments.items(): + with subtest(f"{test_case_name} - {keymap_env_name}"): run_test_case( command, - False, - test_case_name, test_data["qwerty"], test_data["expect"], ) diff --git a/third_party/nixpkgs/nixos/tests/mihomo.nix b/third_party/nixpkgs/nixos/tests/mihomo.nix index 472d10050f..a456facb43 100644 --- a/third_party/nixpkgs/nixos/tests/mihomo.nix +++ b/third_party/nixpkgs/nixos/tests/mihomo.nix @@ -39,6 +39,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail("curl --fail --max-time 10 --proxy socks5://user:supervillain@localhost:7890 http://localhost") # Web UI - machine.succeed("curl --fail http://localhost:9090") == '{"hello":"clash"}' + result = machine.succeed("curl --fail http://localhost:9090") + target = '{"hello":"mihomo"}\n' + assert result == target, f"{result!r} != {target!r}" ''; }) diff --git a/third_party/nixpkgs/nixos/tests/spiped.nix b/third_party/nixpkgs/nixos/tests/spiped.nix new file mode 100644 index 0000000000..a39fc2fd72 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/spiped.nix @@ -0,0 +1,73 @@ +{ pkgs, ... }: +let + key = pkgs.runCommand "key" { } "${pkgs.openssl}/bin/openssl rand 32 > $out"; +in +{ + name = "spiped"; + meta = with pkgs.lib.maintainers; { + maintainers = [ tomfitzhenry ]; + }; + + nodes = { + server = + { pkgs, lib, ... }: + { + services.caddy = { + enable = true; + settings = { + apps.http.servers.default = { + listen = [ ":80" ]; + routes = [ + { + handle = [ + { + body = "hello world"; + handler = "static_response"; + status_code = 200; + } + ]; + } + ]; + }; + }; + }; + + systemd.services."spiped@server" = { + wantedBy = [ "multi-user.target" ]; + overrideStrategy = "asDropin"; + }; + systemd.services."spiped@client" = { + wantedBy = [ "multi-user.target" ]; + overrideStrategy = "asDropin"; + }; + services.spiped = { + enable = true; + config = { + server = { + source = "localhost:8080"; + target = "localhost:80"; + keyfile = key; + decrypt = true; + }; + client = { + source = "localhost:8081"; + target = "localhost:8080"; + keyfile = key; + encrypt = true; + }; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + server.wait_for_unit("caddy") + server.wait_for_open_port(80) + server.wait_for_open_port(8080) + server.wait_for_open_port(8081) + + server.succeed("curl http://localhost:8081 | grep hello") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/teleport.nix b/third_party/nixpkgs/nixos/tests/teleport.nix index 0d0b9a7130..b04b45f521 100644 --- a/third_party/nixpkgs/nixos/tests/teleport.nix +++ b/third_party/nixpkgs/nixos/tests/teleport.nix @@ -9,7 +9,6 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let packages = with pkgs; { "default" = teleport; - "14" = teleport_14; "15" = teleport_15; }; diff --git a/third_party/nixpkgs/nixos/tests/wakapi.nix b/third_party/nixpkgs/nixos/tests/wakapi.nix new file mode 100644 index 0000000000..2e611a986e --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/wakapi.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "Wakapi"; + + nodes.machine = { + services.wakapi = { + enable = true; + settings = { + server.port = 3000; # upstream default, set explicitly in case upstream changes it + + db = { + dialect = "postgres"; # `createLocally` only supports postgres + host = "/run/postgresql"; + port = 5432; # service will fail if port is not set + name = "wakapi"; + user = "wakapi"; + }; + }; + + database.createLocally = true; + + # Created with `cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1` + # Prefer passwordSaltFile in production. + passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI"; + }; + }; + + # Test that the service is running and that it is reachable. + # This is not very comprehensive for a test, but it should + # catch very basic mistakes in the module. + testScript = '' + machine.wait_for_unit("wakapi.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000") + ''; + + meta.maintainers = [ lib.maintainers.NotAShelf ]; + } +) diff --git a/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix b/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix index 1a807b27b6..a31a1b8eea 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix @@ -1,3 +1,10 @@ +let + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; +in import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; meta = with pkgs.lib.maintainers; { @@ -5,6 +12,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { }; nodes = { client = { nodes, pkgs, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; networking.extraHosts = '' ${nodes.server.config.networking.primaryIPAddress} example.com ''; @@ -14,6 +22,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { ]; }; server = { config, pkgs, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com ''; @@ -23,6 +32,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { configFile = "/etc/ejabberd.yml"; }; + systemd.services.ejabberd.serviceConfig.TimeoutStartSec = "15min"; environment.etc."ejabberd.yml" = { user = "ejabberd"; mode = "0600"; @@ -40,6 +50,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { max_stanza_size: 65536 shaper: c2s_shaper access: c2s + starttls: true - port: 5269 ip: "::" @@ -56,6 +67,10 @@ import ../make-test-python.nix ({ pkgs, ... }: { request_handlers: "/upload": mod_http_upload + certfiles: + - ${cert pkgs}/key.pem + - ${cert pkgs}/cert.pem + ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text ## password storage (see auth_password_format option). disable_sasl_mechanisms: "digest-md5" diff --git a/third_party/nixpkgs/pkgs/README.md b/third_party/nixpkgs/pkgs/README.md index 1e565f1b58..052120faa0 100644 --- a/third_party/nixpkgs/pkgs/README.md +++ b/third_party/nixpkgs/pkgs/README.md @@ -132,6 +132,8 @@ Now that this is out of the way. To add a package to Nixpkgs: https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ +(using "→" instead of "->" is also accepted) + ## Category Hierarchy [categories]: #category-hierarchy diff --git a/third_party/nixpkgs/pkgs/applications/audio/flac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flac/default.nix index cadf0c829d..09ce3341aa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/flac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/flac/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://xiph.org/flac/"; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; changelog = "https://xiph.org/flac/changelog.html"; + mainProgram = "flac"; platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ ruuda ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix index 8777f0bb54..ca5d25dd6a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "pocket-casts"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - hash = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; + hash = "sha256-PwM9B2Qx4TxlcahQM/KEBTzWKc4cNrleDEYKg0m8bVE="; }; - npmDepsHash = "sha256-rMLUQGcbBJBbxXP67lXp0ww8U2HYM/m1CP2dOw1cCHc="; + npmDepsHash = "sha256-WPuXTcHCKrwepITGtZFCIwylVAdYlI3cNsuhqx1AEYI="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -52,7 +52,7 @@ buildNpmPackage rec { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ yayayayaka ]; mainProgram = "pocket-casts"; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix index 2a38222949..436a690ffd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; rev = version; - hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs="; + hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix index 826433128e..032706e47f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix @@ -1,29 +1,33 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + alsa-lib, + freetype, + libglvnd, + curl, + libXcursor, + libXinerama, + libXrandr, + libXrender, + libjack2, }: stdenv.mkDerivation rec { pname = "tonelib-gfx"; - version = "4.7.8"; + version = "4.8.5"; src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-GFX-amd64.deb"; - hash = "sha256-1sTwHqQYqNloZ3XSwhryqlW7b1FHh4ymtj3rKUcVZIo="; + url = "https://tonelib.vip/download/24-10-03/ToneLib-GFX-amd64.deb"; + hash = "sha256-RG5rliF4/9LDd07i5dSFQzTGPqyF6UmTfatKb59LZA4="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; buildInputs = [ stdenv.cc.cc.lib @@ -46,14 +50,18 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out substituteInPlace $out/share/applications/ToneLib-GFX.desktop --replace /usr/ $out/ - ''; + ''; meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass"; homepage = "https://tonelib.net/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 orivej ]; + maintainers = with maintainers; [ + dan4ik605743 + husjon + orivej + ]; platforms = [ "x86_64-linux" ]; mainProgram = "ToneLib-GFX"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix index 046203416a..a3f45fee24 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-lxqBmtHkyk4mnM/AJQmpyCmvhW2e96vZBkgtoREjEXY="; + hash = "sha256-6Fh1fbl7Y33EyWbWUhe70CGzhc4y+I59vPbzZydoJ18="; }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix index 18861f0214..b107cd2372 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch2 , autoreconfHook , pkg-config , installShellFiles @@ -15,6 +14,7 @@ , miniupnpc , zeromq , zlib +, db53 , sqlite , qrencode , qtbase ? null @@ -33,23 +33,15 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "27.0"; + version = "28.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; + sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11"; }; - patches = [ - # upnp: add compatibility for miniupnpc 2.2.8 - (fetchpatch2 { - url = "https://github.com/Groestlcoin/groestlcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; - hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] @@ -57,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ sqlite ] + ++ lib.optionals withWallet [ db53 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index cfd9193f08..c6697584e3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.84.1"; + version = "2.89.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-V/bOCddc7UhmN8zlHmKj+H4v+ZZ/qn8jRj0jH4EtwMI="; + hash = "sha256-PPoQnXDVf6Q6QPVE41guJL1vu7rW7mZdpRZjRME3Ue8="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index 37b79d9815..76c4ec5ce9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, coreutils , lazarus , fpc , libX11 @@ -53,6 +54,8 @@ stdenv.mkDerivation rec { substituteInPlace app/proc_globdata.pas \ --subst-var out \ --subst-var-by python3 ${python3} + substituteInPlace app/proc_editor_saving.pas \ + --replace-fail '/bin/cp' "${coreutils}/bin/cp" ''; nativeBuildInputs = [ lazarus fpc ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix deleted file mode 100644 index a602de8a37..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio, nixosTests }: - -let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; - if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; } - else - { arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; -in stdenv.mkDerivation rec { - version = "1.5.5"; - pname = "tuxguitar"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz"; - sha256 = metadata.sha256; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -r dist lib share $out/ - cp tuxguitar.sh $out/bin/tuxguitar - - ln -s $out/dist $out/bin/dist - ln -s $out/lib $out/bin/lib - ln -s $out/share $out/bin/share - - wrapProgram $out/bin/tuxguitar \ - --set JAVA "${jre}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ - --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" - ''; - - passthru.tests = { inherit (nixosTests) tuxguitar; }; - - meta = with lib; { - description = "Multitrack guitar tablature editor"; - longDescription = '' - TuxGuitar is a multitrack guitar tablature editor and player written - in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. - ''; - homepage = "http://www.tuxguitar.com.ar/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.lgpl2; - maintainers = [ maintainers.ardumont ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 9a8aaeeb56..dc01400320 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.5.1) + msgpack (1.7.2) multi_json (1.15.0) - neovim (0.9.0) + neovim (0.10.0) msgpack (~> 1.1) multi_json (~> 1.0) @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 2.1.4 + 2.3.27 diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 1a4f517412..e2df8d535c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q="; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.5.1"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4="; + sha256 = "0gl34rriwwmj6p1s6ms0b311wmqaqiyc510svq31283jk0kp0qcd"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 60049e184a..0913fa0a33 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -107,7 +107,10 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - generatedWrapperArgs = + generatedWrapperArgs = let + binPath = lib.makeBinPath (lib.optional finalAttrs.withRuby rubyEnv ++ lib.optional finalAttrs.withNodeJs nodejs); + in + # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' @@ -116,10 +119,15 @@ let "--add-flags" ''--cmd "set packpath^=${finalPackdir}"'' "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] + ++ lib.optionals finalAttrs.withRuby [ + "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] ++ lib.optionals (binPath != "") [ + "--suffix" "PATH" ":" binPath + ] ; providerLuaRc = neovimUtils.generateProviderRc { - inherit withPython3 withNodeJs withPerl; + inherit (finalAttrs) withPython3 withNodeJs withPerl; withRuby = rubyEnv != null; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix index 936d12af04..d31ce3e661 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -10,13 +10,13 @@ }: let - version = "2024-09-30"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "0705234991d03170a72582085dc508600a03a779"; - hash = "sha256-tAigYqS3ZAtZJp7RaarbXrDxrjiYu2wjNHq6GP/BMfk="; + rev = "36b23cef16c2c624c34bea213f01c06782d2ca40"; + hash = "sha256-QUFcJMbfr5BAS04ig1IHLCMLACeQhFVH9ZCH/VD8i8Y="; }; meta = with lib; { @@ -71,6 +71,5 @@ vimUtils.buildVimPlugin { ''; doInstallCheck = true; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "avante"; + nvimRequireCheck = "avante"; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock new file mode 100644 index 0000000000..861af7fc8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock @@ -0,0 +1,572 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "blink-cmp-fuzzy" +version = "0.1.0" +dependencies = [ + "c-marshalling", + "frizbee", + "generator", + "heed", + "lazy_static", + "libc", + "lua-marshalling", + "regex", + "serde", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "c-marshalling" +version = "0.2.0" +source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6" +dependencies = [ + "libc", + "quick-error", +] + +[[package]] +name = "cc" +version = "1.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1" +dependencies = [ + "shlex", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "derive-c-marshalling-library" +version = "0.1.0" +source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6" +dependencies = [ + "libc", + "quote 0.4.2", + "syn 0.12.15", +] + +[[package]] +name = "derive-lua-marshalling" +version = "0.2.0" +source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6" +dependencies = [ + "derive-c-marshalling-library", + "libc", + "quote 0.4.2", + "syn 0.12.15", +] + +[[package]] +name = "doxygen-rs" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9" +dependencies = [ + "phf", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "frizbee" +version = "0.1.0" +source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9" +dependencies = [ + "memchr", + "smith_waterman_macro", +] + +[[package]] +name = "generator" +version = "2.0.0" +source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6" +dependencies = [ + "parser", + "quote 0.4.2", + "syn 0.12.15", +] + +[[package]] +name = "heed" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb" +dependencies = [ + "bitflags", + "byteorder", + "heed-traits", + "heed-types", + "libc", + "lmdb-master-sys", + "once_cell", + "page_size", + "serde", + "synchronoise", + "url", +] + +[[package]] +name = "heed-traits" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" + +[[package]] +name = "heed-types" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114" +dependencies = [ + "bincode", + "byteorder", + "heed-traits", + "serde", + "serde_json", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "lmdb-master-sys" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "472c3760e2a8d0f61f322fb36788021bb36d573c502b50fa3e2bcaac3ec326c9" +dependencies = [ + "cc", + "doxygen-rs", + "libc", +] + +[[package]] +name = "lua-marshalling" +version = "0.3.0" +source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6" +dependencies = [ + "c-marshalling", + "derive-lua-marshalling", + "lazy_static", + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "page_size" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "parser" +version = "0.2.0" +source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6" +dependencies = [ + "quote 0.4.2", + "syn 0.12.15", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "proc-macro2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "proc-macro2" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408" +dependencies = [ + "proc-macro2 0.2.3", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2 1.0.87", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "smith_waterman_macro" +version = "0.1.0" +source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9" +dependencies = [ + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "0.12.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5" +dependencies = [ + "proc-macro2 0.2.3", + "quote 0.4.2", + "unicode-xid", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2 1.0.87", + "quote 1.0.37", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2 1.0.87", + "quote 1.0.37", + "unicode-ident", +] + +[[package]] +name = "synchronoise" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2" +dependencies = [ + "crossbeam-queue", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix new file mode 100644 index 0000000000..ce685a0c4f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + vimUtils, +}: +let + version = "0.3.1"; + src = fetchFromGitHub { + owner = "Saghen"; + repo = "blink.cmp"; + rev = "refs/tags/v${version}"; + hash = "sha256-bvhLOM0NMx5S069uX2OecEpzYaR3hV4r8nCIPD0f0XQ="; + }; + libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; + blink-fuzzy-lib = rustPlatform.buildRustPackage { + inherit version src; + pname = "blink-fuzzy-lib"; + env = { + # TODO: remove this if plugin stops using nightly rust + RUSTC_BOOTSTRAP = true; + }; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "c-marshalling-0.2.0" = "sha256-eL6nkZOtuLLQ0r31X7uroUUDYZsWOJ9KNXl4NCVNRuw="; + "frizbee-0.1.0" = "sha256-zO2S282DVCjnALMXu3GxmAfjCXsPNUZ7+xgiqITfGmU="; + }; + }; + }; +in +vimUtils.buildVimPlugin { + pname = "blink-cmp"; + inherit version src; + preInstall = '' + mkdir -p target/release + ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt} + ''; + meta = { + description = "Performant, batteries-included completion plugin for Neovim"; + homepage = "https://github.com/saghen/blink.cmp"; + maintainers = with lib.maintainers; [ + balssh + redxtech + ]; + }; + doInstallCheck = true; + nvimRequireCheck = "blink-cmp"; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 01c5e79950..c6a826f386 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-10-15"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "6796194ae7db1c4c79c904e31ba2f8cfd7b0cd12"; - sha256 = "04knqshjbjjqvg4drpfz6fc5w3jndsr5jb71jf5w0r3h0jyxdb55"; + rev = "30eacb81f0202c0d5718fb27e3ec0b03945a03c7"; + sha256 = "0q75ql3fg84nb8vhfxgi1wpmpfz7yk0wqkiw3l7zf1j5xmqskl4y"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -558,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-10-03"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "603156d4fd58963a05f221e76b1a25bc79ed55b0"; - sha256 = "1qd15mv20aplnb4nj1lz0hi6in0vl7g7h4jjj7ma7w7ld7slgvnx"; + rev = "60a784614acb1d7695bd9ae0fee8ada1bf7b0c28"; + sha256 = "0irll73fsi0y005gxvvhjga35gfl2bjyg5q9hgdczagy42xb6hvw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -631,12 +631,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-10-14"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "2e5f135836a700dcc6b787f10097ebdeb8e22abb"; - sha256 = "0nai1872lh4069li7c2s0jk24vf6cql2irx8vi7dybcf7a52rmxb"; + rev = "9854e19fa9f01e5d25a445893ea480f4ac172591"; + sha256 = "0nsnhp86b3y30w7r34nd1ib3m6dr3dx9xbc7hm15k7f2shjwxnss"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -653,6 +653,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/align/"; }; + align-nvim = buildVimPlugin { + pname = "align.nvim"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "Vonr"; + repo = "align.nvim"; + rev = "12ed24b34df81d57e777fea5a535611bab10a620"; + sha256 = "sha256-z8+lEs8bQS4Gz3cgQQ5Cb3oW58Et7it/tAxUtE3cLc4="; + }; + meta.homepage = "https://github.com/Vonr/align.nvim/"; + }; + alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; version = "2024-09-30"; @@ -955,12 +967,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-10-05"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "9d02776ed42874d37869dc683396234e3724b52d"; - sha256 = "126r6kwc7xm132c8v1q830gncyb1iinkh2jalnxg64iw7jdd9ksq"; + rev = "3cd531ce4d46fb156268ddedf5f3e6822ef26af7"; + sha256 = "0jjc2ziw4v6xma416mz4ixk9svsf25p58wc3wvr1v1zsc6nkzvfd"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1076,24 +1088,24 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-09-20"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "c245d90c490c681470389e28782b161491bec97c"; - sha256 = "1nycgf8lrvjsswr0z60kbi6s1c14fgzmichmyymm4100ywyp4k6s"; + rev = "7e5bcd10ae1f1f7cd315fa88049ea21babe11815"; + sha256 = "1srrhhiy8vh4myggwsgn98a1ig26dg9p12zl27zcls1jpd59p0d6"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-09-30"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "ca1326f7d87acfd47b0cbeeb3bef98cec73a92be"; - sha256 = "0irbz0f061fl8f9y45gy7kg9fbgn4qwp51knqh1q1q2fm5nhlvwh"; + rev = "7c28de8c22f4c00ed43a78ae16c13dd6a248fe1a"; + sha256 = "0cd93xldgqbkfbkq5s2bmq6j9mzzgfq5vk8rqbff938j0y3d7ldd"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1316,12 +1328,12 @@ final: prev: bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "2024-08-13"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "fcf3a65a69020f0f54be8fa925f841874a5f3a01"; - sha256 = "0nbskarlk7byghv3w852hlsmc3rylw43x873a4n2nszywc50zahk"; + rev = "3828d24435c86bfa32847c04d1ca4e3606736d89"; + sha256 = "1rj5zgqwbcf31v8py3bixc068cbri4y59xqcj4g3hav3qnsqh08v"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -1915,12 +1927,12 @@ final: prev: cmp-nixpkgs-maintainers = buildVimPlugin { pname = "cmp-nixpkgs-maintainers"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "GaetanLepage"; repo = "cmp-nixpkgs-maintainers"; - rev = "828040c309972f044346e0bf43d0f92623b60d65"; - sha256 = "0wnqhsfinzz3xf746sd731gy6sj05c5z7c09w4lrdchbrxx3zgrb"; + rev = "86711e7d3e92097b26e53f0b146b93863176377d"; + sha256 = "0r1v2lr33zx0zssrpngh74ls8cl3smfajnyc405ykzlbn9p876rm"; }; meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/"; }; @@ -2059,12 +2071,12 @@ final: prev: cmp-rg = buildVimPlugin { pname = "cmp-rg"; - version = "2023-09-01"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-rg"; - rev = "677a7874ee8f1afc648c2e7d63a97bc21a7663c5"; - sha256 = "0cahyz5i6iyjqb4cklrkimw5pjajfnlazpmky617ysl3m1b6pwk3"; + rev = "d6cea15ad504369ec98f3de73b9631dfdd23a671"; + sha256 = "1rjhlc1rldqz79b1han5xrbwqvx514h3yvlsz7rgx58jscv6mmx9"; }; meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; @@ -2647,12 +2659,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-10-04"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "40d4e98fcc3e6f485f0e8924c63734bc7e305967"; - sha256 = "0w78hq284hl3c8wqvsxfkpwpcr1phby5xnnb7wmj4lqr4rak5k1w"; + rev = "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3"; + sha256 = "0s8q34ibc48dx2mavz4m04gjyjh0z4al7xhbb6c9m620gmgpxvsz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2720,12 +2732,12 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-09-11"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "1a237cf50372830a61d92b0adf00d3b23882e0e1"; - sha256 = "0cjsygqvv2k8lrngln70x1ilb7fmsp812yayxvg3qhc7krc5cz4h"; + rev = "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0"; + sha256 = "1yzfkvqjcmnbkxsdjy81cjal8zqqs9x6ai44ky11z0ly1zcqv3ji"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2780,12 +2792,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-10-15"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "27cca63337debdea4a8da61f758abc82a0045bfb"; - sha256 = "1f08b0p2ffqkswwlx32h6b16q4n2mafcs9q612yfzcp7hkx9ffs2"; + rev = "a23759c0d6f48f5b6b5b1504f24d2021fb87f374"; + sha256 = "0cx46c93bzss1rdxncy6ypscmanj5ywzdmzgn01cby05z44188q0"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2924,12 +2936,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-10-09"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "e2ff36e57bb6f75a627e282fa2c6654e658d3052"; - sha256 = "0fdhamfbvlzjjsla81a20pkyaw71ras3zkba41j1vfas9h6kjr0g"; + rev = "7e6feb49d2ec47a742215754ec0ecc51eebba55a"; + sha256 = "0ilv916j4wf110fapy25glc99qyps9dajvb1397xz95r6cyqc7ld"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -3044,12 +3056,12 @@ final: prev: ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2024-10-14"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "517a127d10b7babe46647fd571ae468cf3a2b647"; - sha256 = "1y2wm3hqikyp23msbbxa64yxkpg9nb87gfyff5ad845x9w0sl18i"; + rev = "ae43c61dd0ebcf6ce7549c7c7bfebcdfaeac7d07"; + sha256 = "0wxaziykndc6p9nzlizfm6i7pxa9fylb1yg3hymia39v67ywphf5"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; }; @@ -3176,12 +3188,12 @@ final: prev: deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-10-03"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "f5d32c646e7d4d43ca5b376cff2c1edc67070832"; - sha256 = "0dl3ihcv6sgwylx305ays7w8lgrlw961bgnpzqwn5bq96z984ffj"; + rev = "72997a29dbc1f75b5b6df71d2392abb5ef92e6dd"; + sha256 = "1w880g2g5f3p5slk7swcgbz8psk8c2wm54klmk4khmyx79b643jn"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3514,12 +3526,12 @@ final: prev: distant-nvim = buildVimPlugin { pname = "distant.nvim"; - version = "2024-10-08"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "distant.nvim"; - rev = "cf8f00d88fac3ed52ecdd8d485e4a565ba4c660f"; - sha256 = "0677mgkp91nx9hbmjkxpagqbpzxiapylz89yiq50al34hqaqbl4w"; + rev = "67d6b066e8490725718b79f643966f4eafc7da3c"; + sha256 = "1vdcndix4rb3c8p4yjhrwach5p708qbi2bmhb7xlx2rlfph2if89"; }; meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/"; }; @@ -3550,12 +3562,12 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2024-07-12"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "fdf503e52ec1c8aae07353604d891fe5a3ed5201"; - sha256 = "1f032gwhr92w57mb5bfsgr14ayi7qg93rvjq04cy5kwdniqg92ij"; + rev = "94fa7885a06a67f0a8bfa03e064619d05d1ba496"; + sha256 = "1yxkhi11a81nmll9il3jq2ii8nbh7x2mf2k5w8ql5y27bdl4wcfy"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3671,12 +3683,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-10-14"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "6c9dd80d4c2071a0328947cf6bcb6b91cc62c7b5"; - sha256 = "1vxw7xd999iyb6lbyhy5k9d4vw0d96b54712vh4kj7m1bpbbgmjp"; + rev = "e44e39c962dc1629a341fc71cfc8feaa09cefa6f"; + sha256 = "1ca5wrkkdf1p0lzj6h34mxvk55gy416zy153ksk6rlcf2ci5hg69"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -4067,6 +4079,18 @@ final: prev: meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; + focus-nvim = buildVimPlugin { + pname = "focus.nvim"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "nvim-focus"; + repo = "focus.nvim"; + rev = "3841a38df972534567e85840d7ead20d3a26faa6"; + sha256 = "sha256-mgHk4u0ab2uSUNE+7DU22IO/xS5uop9iATfFRk6l6hs="; + }; + meta.homepage = "https://github.com/nvim-focus/focus.nvim/"; + }; + fold-preview-nvim = buildVimPlugin { pname = "fold-preview.nvim"; version = "2023-01-27"; @@ -4081,12 +4105,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2024-10-10"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "77979a90a80849e60c6a9249427421b65d5a9a68"; - sha256 = "139wx2bhvs2iyyc3bysgln40rj1jcm5iag5yd39hcwwdk2f6f4iz"; + rev = "04547bdfe89035731a2815a3875b87f77d43e36d"; + sha256 = "1ih28z1y6g8r20si698zispkwra5mll0g8b1lc6778cjfd4dy32j"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -4465,12 +4489,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-10-14"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "fb612d13c34d3d1d2caa4d5785733abe70dc22f0"; - sha256 = "1k9vcgwnl1nvgww0mnqpmlf1m7478jbrl34cp5h94z40qxhld05v"; + rev = "51676b430fc9288073769319ba0ccb2a3bcd79c9"; + sha256 = "03aj4fx8s54wihqa2q025kkwvavxivnska1jv73qz0shcbzhbg4s"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4585,12 +4609,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-10-09"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "f47594f05d10b0bedfc0ed78e488e7fd714d57be"; - sha256 = "14s0y1lzchqghr1rkirwmfys0q1l3rl9h1b80acik3pcmdzgr1i5"; + rev = "190c03d54e8976491e6e49acb97087bf4182b079"; + sha256 = "1awfikdwh03i0wjdfr9aa2nwzsmgmiv9dqpfq0613z8wr8dw8xn3"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4969,12 +4993,12 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-08-08"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "8f51ef02700bb3cdcce94e92eff16170a6343c4f"; - sha256 = "07py0rhr6wx1nbq8i20a71iv0arp7ym75ffyb3d3n5icmf53inl4"; + rev = "08ddca799089ab96a6d1763db0b8adc5320bf050"; + sha256 = "07mydcm3x7xc7x6wg5l6kcx8yrrv9bwy2p44y17ajyx37c5lmwwn"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; @@ -5015,6 +5039,18 @@ final: prev: meta.homepage = "https://github.com/othree/html5.vim/"; }; + hunk-nvim = buildVimPlugin { + pname = "hunk.nvim"; + version = "2024-09-19"; + src = fetchFromGitHub { + owner = "julienvincent"; + repo = "hunk.nvim"; + rev = "eb89245a66bdfce10436d15923bf4deb43d23c96"; + sha256 = "19j3gcv83gpqqpk39dd1q3wd7p3wrxgry57i3z21rchmd13dzfq9"; + }; + meta.homepage = "https://github.com/julienvincent/hunk.nvim/"; + }; + hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; version = "2024-09-05"; @@ -5378,12 +5414,12 @@ final: prev: jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2024-09-09"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "d112541c062122969c6c0bc3df7e3cab3595c253"; - sha256 = "0xcvzjnhgwjw42mm0j5ikw2yqsm4w7ibgmkfxf61fn23npzjalf7"; + rev = "81c0602f531ceceb20dba9ccb9a04d047a90b200"; + sha256 = "0ngan4pijpxa5273s2s141qr9xdf9cmblwgkwha89sqvv50q6h0s"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; @@ -5462,6 +5498,18 @@ final: prev: meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; + kdl-vim = buildVimPlugin { + pname = "kdl.vim"; + version = "2023-02-20"; + src = fetchFromGitHub { + owner = "imsnif"; + repo = "kdl.vim"; + rev = "b84d7d3a15d8d30da016cf9e98e2cfbe35cddee5"; + sha256 = "0kh0wgwpjbp2iaznk2s8xy0l2l26zvlb9s3adwxapb13a4mwma11"; + }; + meta.homepage = "https://github.com/imsnif/kdl.vim/"; + }; + keymap-layer-nvim = buildVimPlugin { pname = "keymap-layer.nvim"; version = "2022-07-16"; @@ -5524,12 +5572,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2024-10-14"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "c7a2c793dca8509f9792e9d35d377de016c88a5b"; - sha256 = "1w8riv2bvqbl6dvllx7kn0j8aa33mcp44j7ghczjd5kzbxqpzksr"; + rev = "af1de146bf661306789a9f7c546a08ae5b7ff9c8"; + sha256 = "1x5hv1npwd04bfmivkn4m2bri1nngrhlfx8imqqbph7frqhpnv9c"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5632,12 +5680,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "273749f1769f6fd5f45aba44af0b0c7ac47c3f5a"; - sha256 = "1kkvcm11sd4kj729dgnn6fclx8v8s4nq464mnd5am7igrkpjrmrv"; + rev = "5acde1275e0d278bfe7373243b1f29165f6b213e"; + sha256 = "0ramsr7f7sh8f1q80zi13v0l9qc3jw7iz8xrna0c9swzdc28vrs5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5692,12 +5740,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-10-12"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "192fbef32d1f7d70463c4c8a634c2a75adc41348"; - sha256 = "0grhj484513hrnmpr9wlvc6fa44lm3jr65cm50ymkza3qjnjnbcj"; + rev = "cf49f78dac43031e1b924a5fce2e538581c36d76"; + sha256 = "19nf2j61y3rrj9yx5mqryi59wcwvf4n2z9gsjbsg1p1nal0zl3qw"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -6111,12 +6159,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-10-13"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "3c1af059348350b0bbb81c5ca3c1f8f573dbd64a"; - sha256 = "15y7bv8ywaihc1s0ifs5g8a6pcpdlqm4c15ahg8ygys2hnb4l5r7"; + rev = "d027f8b9c7c55e26cf4030c8657a2fc8222ed762"; + sha256 = "07lpv4swni0z8z76q7mrmis003rm5p25fj2dwy0j8gf1hpigak2g"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -6617,12 +6665,12 @@ final: prev: mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2024-09-06"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.deps"; - rev = "203dd6d947e3415711c732530a82f9c3f2f046a4"; - sha256 = "1xydh3l41hifwmns6aqnrch545h1hqsq4a7mgk915wzp1g843qfs"; + rev = "bafaa69d9054fc01ef8dbff8e4f0211c285cd840"; + sha256 = "12vahms3vpvinp362x1zi3z9si7r912bps55yp6v9vlvfdjmc9gf"; }; meta.homepage = "https://github.com/echasnovski/mini.deps/"; }; @@ -6809,12 +6857,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-10-15"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "d4ce7d025f9c7bb4d55ebc4fd88987651e632893"; - sha256 = "10cls549nsv4bgmqqky5acdy8f912901084vbqzrgq7dnx7j3vzg"; + rev = "9618cf56e76cc0caab54ad60116a8d72f99d7b3b"; + sha256 = "0vqyspxincyhck5fmx4b35y0k5m33d76c6v7n9cq1a2c970grlij"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6857,12 +6905,12 @@ final: prev: mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "2024-09-12"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.sessions"; - rev = "62f2e3823f98673fcf1b79322cc06d8a1f453d30"; - sha256 = "1js9ma0i7a4lil6h4bzbxjx6s63hj4z7qy5ixf737x34ba5d0ipr"; + rev = "c9c633f3e423885f91c49e3b9e8e6141af25429e"; + sha256 = "0ds8dx3gazmsvdmj50mlfan9xzvak87rx96cg1kpwqjw06y972pf"; }; meta.homepage = "https://github.com/echasnovski/mini.sessions/"; }; @@ -6917,12 +6965,12 @@ final: prev: mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "2024-09-06"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.tabline"; - rev = "2316dd47e1e1f4a8e9255c9060acbee89bb26e59"; - sha256 = "1lbh0qzjdhx7vkycl799byjn3a62frrfgdczyzj2xdyfxv6823h9"; + rev = "06ef4ecaeca2e362c7d31113435d86d144b3cbbe"; + sha256 = "1z808l3z7ywqxmqwfr1ab9ynyma5c1878x9ski0nrhvw4fli9rwy"; }; meta.homepage = "https://github.com/echasnovski/mini.tabline/"; }; @@ -7385,24 +7433,24 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "887be0ddcf27f6684898e5f9f33297365146a5ec"; - sha256 = "0i2fafb3wdwpzs2899d9r0nmfxpq22d05vvvwrbkhpa77lwli7sm"; + rev = "a5af8418318f2bcc7513d52b001d68d551bf3b55"; + sha256 = "1vfa38spyl5x5l2p2vaqxiqidrx6lg2sgmwjz95zyv39sjxsal8y"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; neocord = buildVimPlugin { pname = "neocord"; - version = "2024-04-24"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "IogaMaster"; repo = "neocord"; - rev = "aa7a58023166533da83ca7b11c0d2569e45d7381"; - sha256 = "1x4mddm4ax3chmk996w5dw8rzxa7yap356rc68rq6p3016frsmd1"; + rev = "587e03390a355e9c364d48638e0e0db2a8431d73"; + sha256 = "13b290yd74w23p6mng225nh14pi030ap7ah8lsby7w895335mmg1"; }; meta.homepage = "https://github.com/IogaMaster/neocord/"; }; @@ -7457,12 +7505,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-10-14"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "eda716c44d3b5a424ea8604b10756c7fd8bed93a"; - sha256 = "1mdyn40ih75pnqrmayiqc3pcwzi80h3y4s60k2yxbbgr0dp9c8rc"; + rev = "c41a654d6148e1858d98e37cea371993eac0b126"; + sha256 = "0nja882dpdaipvfzpqx8l8jxjpx5nrgqn6rxp54gph73cx8ipqr7"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7724,12 +7772,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-10-13"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "6b555ce43d3b9d29f484abf98ccb70e7597a50bb"; - sha256 = "02wrqp854na7k2rxr204ckwc4kvm1pxlsrxknpm60jqinm1fj3i0"; + rev = "19d85cd6c1b99ff4a99c16400d5033150331b4ba"; + sha256 = "17rl29iy8d7gz0vjw3w7wnwirnkx4xpv9w1lbcn4ih2gay4a36by"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -8120,12 +8168,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-10-10"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "941dd4b9d8c9420968dfdef0675f120965f7d637"; - sha256 = "099mql8lw6xbvdvdqbg0ks2l0z1xy4k895kc8cl0bl89970r5908"; + rev = "522c89562e3ca1eeb8f29435db2d4e9e4995c55e"; + sha256 = "1zpdrw9hslybsjkqrgfqw5lvn5zszb1k4wvqb11gnaxd1xbvm426"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8192,12 +8240,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-10-11"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "6bdd9b3364e12ffb346ac224db3df37de0b1429b"; - sha256 = "145jzbjsx10dl4n9ni7p0ggcnhjwbz5fs6ksyrq73h9f0h6vcfxw"; + rev = "dcc8cd4efdcb29275681a3c95786a816330dbca6"; + sha256 = "1na4w7daxsi25hiadffc2j4vz3zkxs3p0al0zgmgaazf36qywys0"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -8288,12 +8336,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-10-10"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "f6025f0788880989484733c90deff07dff01ef02"; - sha256 = "0y7pi4czifx7di9j8msd8nicqvn6scd4vysg7zbrxpkavzzg09jy"; + rev = "09dd13e9c6df98fe5609829a7a0fbccea2f515ae"; + sha256 = "1j3354kfgj008nl1r24n2xlvjxaz9jhs1ck0vgbqvkl9smxzf74a"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -8408,12 +8456,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-08-01"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30"; - sha256 = "0fk7s6apvq4r9h82jqm5azf1zg9aklyycgh7ivnb98bw9a0ivjim"; + rev = "82bd4b59432d44cf5e2a5ce3a40a037a575a6623"; + sha256 = "0x2n004m0ar8bv4x20qpirld7ih235pm1q39im6cff8rffxf4qwm"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -8694,6 +8742,18 @@ final: prev: meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; + nvim-gomove = buildVimPlugin { + pname = "nvim-gomove"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "booperlv"; + repo = "nvim-gomove"; + rev = "2b44ae7ac0804f4e3959228122f7c85bef1964e3"; + sha256 = "sha256-9YLJm/L13gTktb6VIkz2W/60cothFtF7feiKd26R5lo="; + }; + meta.homepage = "https://github.com/booperlv/nvim-gomove/"; + }; + nvim-gps = buildVimPlugin { pname = "nvim-gps"; version = "2022-07-05"; @@ -8803,12 +8863,12 @@ final: prev: nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; - version = "2024-08-16"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49"; - sha256 = "1wf5pfjpvn7hvm9p9mc7w9j7wz2rr7ppdys8cx4jcqib9ja5vy99"; + rev = "33d4c95e0e853956bc9468b70b3064c87d5abaca"; + sha256 = "1njf3f3jw1ynpac20rf688g1gais7ca71wzwzh3iijvhw2wd5x95"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -8839,12 +8899,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-10-10"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "f707b3ae50417067fa63fdfe179b0bff6b380da1"; - sha256 = "0zws4m0jcprpn0d0ny2k6pvkmca917wjbqwk13g1p8rp87ia5yy1"; + rev = "16b21a7d04d06661f92f273a0744fd81fb19e09e"; + sha256 = "1krhqq16nrz3hm9h0a5yqir75lv8nrc62ii4kxjr885b4bvr9hg2"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8875,12 +8935,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9b2509f17c284486497358ccea1019cc17c28af6"; - sha256 = "09g1zcpg1b98fgv6siibd683ci5yfih4papv56nc9h2vk01a9p8d"; + rev = "fd49d5863e873891be37afac79b1f56fb34bb5d3"; + sha256 = "0sf9v5dj7hgxrp3d96hqwr8j3my8hmjxz9k0mqipysz0rhl926nb"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9055,12 +9115,12 @@ final: prev: nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2024-10-15"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "2f0e7fc4fc5c25cb0e8af7fc0bd1fe00f1fe131a"; - sha256 = "1qphsmankkrxgnbxac8ja366akp22139p4c9j6pa9z988ipq4bz2"; + rev = "f842d84854f3ad5231bc85f52ee94f3fb4ede326"; + sha256 = "00v0hi4xlg5aln8cl2a6gl4d4kdrx5ixnr6llfk59x48cgcvj97z"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; }; @@ -9139,24 +9199,24 @@ final: prev: nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; - version = "2024-06-03"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85"; - sha256 = "1zm0xaph29hk2dw4rpmpz67nxxbr39f67zfil5gwyzk3d87q56k3"; + rev = "6994eb9f73d5fdc36ee2c8717940e8c853e51a49"; + sha256 = "0h01gcaqgjkb2392zl2jwvlsh5qmz10k9sy5rhyz1kwizmw7nw7y"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "db413e93ef6d50b4e92bbfd7a82263057a6cf28a"; - sha256 = "1jshj0qq80pnf0x6np76xrvwswawl5yyikzvxid8kan0s86gs3nf"; + rev = "f7f611330a8f7cd00dc81538fec369611be678ed"; + sha256 = "1xx5aayjdjc6r8ad3lx70f67nsyi7zi7wclwd4a1zq7rx5j49vn9"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -9295,36 +9355,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-10-14"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f5f67892996b280ae78b1b0a2d07c4fa29ae0905"; - sha256 = "0pqzd4yqsajr26b1bc359ylj7ywiiallc5akq7996hnakcx6r1c9"; + rev = "2a268f631da85e83b7a95291be589bcddfc785d8"; + sha256 = "0ka4y3af9lfslmn08gsr0q9saldcf5fz7ham1f5x59rw5vndnaq5"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-10-15"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "da926103921117cc6dc8a518bc9b949c90d1c70c"; - sha256 = "006crqfchxf94x5y1v5hi9jf023m7k39xqjh8yjffwzc8whsyd4m"; + rev = "9a94cc23cb5499222923bf6119f6199edf84f381"; + sha256 = "1kda4nai5r4xj12v5hg8am6lbg8r0niksij0p62r2jjj9bj4bs63"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-10-04"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "78a81c7494e7d1a08dd1200b556933e513fd9f29"; - sha256 = "19vf1wlvi7nggwzawaqyp81jk8hp85xsg1nm9cgjzk9fvywddnpc"; + rev = "e7fdb4cdf0942cd6e63dd822110a93c0ec777fe5"; + sha256 = "1d14699z9wdgjlksbdgkib2dr6ja0kpda9ymrv3yfyc7fyia7kjw"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -9341,6 +9401,18 @@ final: prev: meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; + nvim-treesitter-pairs = buildVimPlugin { + pname = "nvim-treesitter-pairs"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "nvim-treesitter-pairs"; + rev = "f8c195d4d8464cba6971bf8de2d6a5c8c109b37a"; + sha256 = "sha256-VHq7ohBDThkBwqUIEVBb4RujBkftu96DQe/y6l7egzM="; + }; + meta.homepage = "https://github.com/theHamsta/nvim-treesitter-pairs/"; + }; + nvim-treesitter-pyfold = buildVimPlugin { pname = "nvim-treesitter-pyfold"; version = "2023-04-11"; @@ -9365,14 +9437,26 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; + nvim-treesitter-sexp = buildVimPlugin { + pname = "nvim-treesitter-sexp"; + version = "2024-06-07"; + src = fetchFromGitHub { + owner = "PaterJason"; + repo = "nvim-treesitter-sexp"; + rev = "32509f4071f9c8ba5655bf2e1ccf1f1cd8447da0"; + sha256 = "1mfayp49nglk4xv1zmzdc8d6dxkjn3dqlywhwwkcdnyqg6y4c6ks"; + }; + meta.homepage = "https://github.com/PaterJason/nvim-treesitter-sexp/"; + }; + nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-10-06"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "b91c98afa6c42819aea6cbc1ba38272f5456a5cf"; - sha256 = "08chzl9943657f7mp8f83k95cic14br0d8n9233nj17fng0k127v"; + rev = "0d79d169fcd45a8da464727ac893044728f121d4"; + sha256 = "0qhndwxbbaf324gp8hqd33x6a3z1vkq8jgv5aqpcb05v2i2byfzp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -9571,24 +9655,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-10-15"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "896d48b6184f69113599e9ecc46611e9d0b5fbcf"; - sha256 = "1p1618cnf1ag6nmirpm6z9hx57cwrpn5wfnhncr6rifjndjfmas1"; + rev = "a83ca8bcee6cf4a9288bbfd1b97a51ba32068c21"; + sha256 = "03pwwkb06b7dfd0m5w98b05dfggn1vnpcxk531p0vsmiy263qyyh"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-10-04"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "ccab9d5e09e2d0042fbbe5b6bd05e82426247067"; - sha256 = "08ywsapg9j6simfixj7bxw4b011d8dbsrvy7yiawzvfry1hpqmxx"; + rev = "39dbf875861449cf09e936fa80073f3413e9439c"; + sha256 = "1j97c6f5x6vv5rdsb92d64hi1d9p2gd84n4awl6x5bdzqnjr55pn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -9680,12 +9764,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-08-22"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "ada0798b1bf6d0bde1fbf239c22de778bf5efbd1"; - sha256 = "065f1cvdkaphdpqnslyaj7bk4wqkwa5rk8a2xh39j00migqw9p09"; + rev = "035d63a2fd13885d526f1b90b0aa16a949310ec1"; + sha256 = "1wpyy0kax9v7177njpc3l3sz77zd39ysglppgmgb8sjs9a4qh6bs"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -9764,24 +9848,24 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-10-09"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "a5aeb14663ef08e0bb4bb847f8d79f9c253094a0"; - sha256 = "0hwplx3dj7mn95cqhj9hrc9dl2q211ib8hlz3fn4771bsadabxzh"; + rev = "05d69831e57996d09d9c6d9b135d141d6c051035"; + sha256 = "05scr3vhdhq11sk4fbqbndska8nfsw63mqpx7kllalzvkcdw31pi"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2024-08-26"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "252cc279eb3d76685ef48aaeced1c3cf9793581f"; - sha256 = "1jcibj2gdhzqwy6rsgv0x246qv2z4maxd6yawymbs9pmxr05lf3v"; + rev = "64a2f8756468a4d09534a55b98d9d6bf86fa105e"; + sha256 = "0p4asblgwiagxmz3vlk6xblkfqfdnyirplz3haq6xwwy8a0z574m"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; @@ -9812,12 +9896,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-10-04"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "965f8159408cee5970421ad36c4523333b798502"; - sha256 = "1z6mrgkh0rkpc565r5hlfqnfqgfywcxz9hizw69zyrfhy8x8yg58"; + rev = "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef"; + sha256 = "0817pw0vaa9war0d7skf9438mazdf9ip29amw77zlbjqcdzg5nbi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9945,12 +10029,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-09-13"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "3006e641e2892b58fe51511c31595515e1a7dc00"; - sha256 = "19zp691z8lbxyg1fisqz8lf3jgra4sww6c6qj270im8kqc4h2spp"; + rev = "e9a179271b1c7888e0a87448b3cf81652a6606c1"; + sha256 = "1d0yyl9qm0diwmz0ma44x8sj964qq82hrc0pyz9lg8qmpi9di093"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -10053,12 +10137,12 @@ final: prev: poimandres-nvim = buildVimPlugin { pname = "poimandres.nvim"; - version = "2023-08-16"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "olivercederborg"; repo = "poimandres.nvim"; - rev = "77635055e686ae3c8a519198006ff0b43b6b2eae"; - sha256 = "0rnpx5c5pcxr5prpl3642422ggir1vfvll643dj9h21h9k1b12xh"; + rev = "a488957d803943a4201ac3b774913fcafa9e6b3a"; + sha256 = "0jxika4w73hhi17y69lpiwwqfl2a2910s8inyskzfddxam1k8ivk"; }; meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; @@ -10210,12 +10294,12 @@ final: prev: pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2024-10-09"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "b2ca20dedf32b80dd0cbd654770ec3f70841be68"; - sha256 = "1qq0ha1r3yl4m94p83lcy0lrjazajcpnsd2v9rd9y74mznbh93f1"; + rev = "c50cbf602dac65cba30111cf1eddb1eaf39ea448"; + sha256 = "0dnsrxm16avw97c6jirm2mrriyh97lksldq047nbg3ia2g9px58c"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; }; @@ -10402,12 +10486,12 @@ final: prev: ranger-nvim = buildVimPlugin { pname = "ranger.nvim"; - version = "2024-02-09"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "kelly-lin"; repo = "ranger.nvim"; - rev = "d3b032feee6b3b0cf923222f260523e2bd7f3ad3"; - sha256 = "07c0rri7v0z9hjdj3vqsqjms43y2a9kqqac2s5is7ksz2hqi5yzj"; + rev = "0f06eb92f2a5a618dc0d606d90e634d83e6e6b63"; + sha256 = "0mq7nlz11xnpla7zw6v9bk92xq1jzjmfnchprq4nnbfld44blibx"; }; meta.homepage = "https://github.com/kelly-lin/ranger.nvim/"; }; @@ -10498,12 +10582,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "5925f48b8c00bb6911763f2a2de19ce05d375e85"; - sha256 = "1vn7nnr7h8g5i8ljqfrj11mzbqs6qamw2rwi5xrihaxmjnhbp24z"; + rev = "e1a2289106a9ce5ea1b20b78c90aef4d890950b7"; + sha256 = "15xf4d6fsl68fqv31y6dk3kr2818z4jlc236gdg4kn7mxgyj3azm"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; @@ -10896,12 +10980,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-10-12"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "70f9e4f36082bf28b8bc1d05e2ea7c3f6aeb51ff"; - sha256 = "1rkwqh6nnf9fv2s1g4fbwsqb6jydkr5zspb60sy1bs1y4maj3lv2"; + rev = "32172b6598c1c647b96aeead67896c59ca4b7aa6"; + sha256 = "14bi0qwrlfgb2f1bjp6y18ldp4j71afyqsmykby740fzvxgkmmj0"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11245,12 +11329,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-10-01"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "ecc04176e364dd7f614edfc4325e3a8521905ad6"; - sha256 = "01vb1l97n4slijbn2ljwgpdmdsk4xgp1cj7d001rvi7kc3vlvbrh"; + rev = "5998d16044159ad3779f62c45e756c555e3051f0"; + sha256 = "1irwr533hn5321wglrl08cvnk4jwdnyh1zs9433cffl0lzf86a1b"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -11487,12 +11571,12 @@ final: prev: taboo-vim = buildVimPlugin { pname = "taboo.vim"; - version = "2019-08-27"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "gcmt"; repo = "taboo.vim"; - rev = "caf948187694d3f1374913d36f947b3f9fa1c22f"; - sha256 = "06pizdnb3gr4pf5hrm3yfzkz99y9bi2vwqm85xknzgdvl1lisj99"; + rev = "937f67ab9dc2ba1861fabc40ca367e5622c30d36"; + sha256 = "0rrhakigsyvbhmiwr5ywrnq9ixh19xk906b76bqqlw783cwp5p06"; }; meta.homepage = "https://github.com/gcmt/taboo.vim/"; }; @@ -11801,12 +11885,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-10-13"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "b04d358d3c1bf65e1a3b10812c4f0a9f57fb6fc0"; - sha256 = "02b91csvggcw5yln87kbbx7jl7j9h0dl8rd0nlqw77ds0345yvbi"; + rev = "913dbb2894603ca613f4ff6864827c6383395229"; + sha256 = "13qc3cf8w0j67g61scg3jb19fyd6pr30rnmwldsqnfz3k2fdcf7a"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -12018,12 +12102,12 @@ final: prev: term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; - version = "2024-09-30"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "b190a91178ef98beefac2ec0823db047978ea327"; - sha256 = "038aqf5bpx233w49gdvpmci56rl1m60cqkkwq2h5fkc4amxf67l8"; + rev = "29c4584c2cef44a3fdcc55860957d081b892a569"; + sha256 = "0g05gi46i4yx1k5fhqrlv9rvw2nvikdc1dpr4d5yjzjhbpx2gkmc"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -12162,12 +12246,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "1618f75a6c1dab4e96a1c0fbf436da346bc2db18"; - sha256 = "1i58y1hz9kxxq9ca69g392hjjvlbif884vgybakd73ywcsx14bgr"; + rev = "ccb67504f93b20f36775d3aad620f9dc9ed98bd9"; + sha256 = "0rhhzf3rza5q7qhk8h320gwhbq7fwajv5gl16yybx2im58vls2l2"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -12343,12 +12427,12 @@ final: prev: triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-09-27"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "7fae7598870f5010696fb79427a475ab0232f175"; - sha256 = "1p2x86msjmr3zdamrqwmy1zqlv6nig08fwqj8ddwl4r123dq4ima"; + rev = "ceee8bc858908a0802bcdbf4dfaf8cb732a6877a"; + sha256 = "1djbs2asscbffi4wmapmxyp4wn3jkm12516nhs2lid6cslvig7ih"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -12548,12 +12632,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-10-10"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "e2c42cac45a77b5548ddcec57eb79b6996659d2a"; - sha256 = "1cjg9plvwq00plynk7k993rbg65zdwgmyv0jvl824wa3inh0fv7w"; + rev = "b1ac7ba1b984dc5bbabee7e136fea5674218e791"; + sha256 = "05df053ddczcv243kd5bcyz1h2p2kwivqqk8rmangs3h66dzvp98"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -13724,12 +13808,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-10-15"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "b74e49c11707fdfe23d101557dee496496611ab2"; - sha256 = "0iqq3721hx28p51lm6b7irffqglpsxsjjy1h11x7hrhphn8qdn0q"; + rev = "fe5a55e92b2dded7c404006147ef97fb073d8b1b"; + sha256 = "1qy9pm7rwpzk8a5f2a1bqa6fgnkl4y06rqwsrkd3p3396kl1s6f1"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -15094,12 +15178,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-10-06"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "f08fa6b29dbfc486696fa606d44af86bc88fb1e8"; - sha256 = "1sprx6dzc0lbdrjcq6m2dzbb2r1jk1wwfqapbd7a2cvypc18gqf2"; + rev = "c11e414956e748255ee56cba9a8a10ae68dff728"; + sha256 = "05cggnd8gcbyhqvyvnq4y16imiaj2f3njr6nwmcq7qi1gbgz9x1x"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -15491,12 +15575,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-09-12"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "1975afe63198ab6a0dff7200919828e5cd4330b9"; - sha256 = "05gwlf5fmkvs4p92n7l397brb8g6g62pvxcd93kffv289vmx7rzk"; + rev = "57d3a4bbf4c9a0ab73f2cb90c4a9c93fef4c420f"; + sha256 = "1b0qvf0kd69b4y5r0c32ajy8gyj63c8bmknc43hycicij3dh3bsz"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -15575,12 +15659,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2024-09-30"; + version = "2024-10-16"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "9db250617c625d3265b54a500d9774debcdf4749"; - sha256 = "18fj5m39amap98g8p3qbqw3h0wrir57g8qkgp8bxv16bwlxdlj9k"; + rev = "c3efbdefa3d43d739e61294ac39af4a68806a889"; + sha256 = "1hyvp5sf807an2s3ld08xs4p3xisd9s0rnpc0w6w1kald2ffzlq0"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -17496,12 +17580,12 @@ final: prev: vim-vsnip-integ = buildVimPlugin { pname = "vim-vsnip-integ"; - version = "2023-07-01"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "1914e72cf3de70df7f5dde476cd299aba2440aef"; - sha256 = "0jqnzvvhlvwrqbxk70j1z7qx5hgzqjnv0hp8rzs9sfbv3wkgq12q"; + rev = "90ae474e8b05ed41e36d6f58382a9fbfb4b672c4"; + sha256 = "1n8g9knii0y5c7gnwmndbw2c2ii5xji0i90cfdcdvrkdhfacpyha"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -17869,12 +17953,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-10-13"; + version = "2024-10-17"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "9a5ef1d4ac8e4e06071179ebe8121350fcb97861"; - sha256 = "1zp8wvys8m61sqpyil7ra33pinnq8kliadric0d7iii9d4gjqidd"; + rev = "4dd3be5cc4e8f6ee7401e303a8211efb4d91bcf6"; + sha256 = "11a84xcm0rm4mv8521pi5a9dgiv8lys11nrda5kwh5vlrzxdwdwx"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -18242,12 +18326,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-10-14"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "519940019913a5e742e2dd2f04712d9ff8869a10"; - sha256 = "1yir1h5k6ni6wqbxbj5fs2rmd7bwl1asj6nh82h987mg8s7w3gf5"; + rev = "54065a98f27c562484041fd1137118a148468eb1"; + sha256 = "0w8n7ai9inlgbgzp7hfsskcqnxwxsjwr84zpdcy9p3r0cysiskvp"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18422,12 +18506,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-10-05"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "7be452ee067978cdc8b2c5f3411f0c71ffa612b9"; - sha256 = "1zn3z1wyjaiq27635ifx83b4ikix7svq5rvqmyry3ijsrgpp98cg"; + rev = "ea02cc8c3c053c6c1c574e0791d743338e3e788f"; + sha256 = "0z0wff1dd8wh0cqd7yx3d14wcjr80iqqz0s8a3m9nllxp9bqsf65"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -18542,12 +18626,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e0891549ec3ccff7d68a57915e7af97c9608ffad"; - sha256 = "1sj9gjzr8g035dhszpcg19a6f68ibqj65bfss39vm4qhk9zr85kn"; + rev = "3839b74f58602bec36db8150333c8b09966e42ed"; + sha256 = "1jxc2jr0vg1yca5md124zcvj6ncmqydmz8fhbzmaak5h8fgqy3qi"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -18612,6 +18696,18 @@ final: prev: meta.homepage = "https://github.com/samodostal/image.nvim/"; }; + scretch-nvim = buildVimPlugin { + pname = "scretch.nvim"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "0xJohnnyboy"; + repo = "scretch.nvim"; + rev = "0b2fbd0ed285f74baab7396a4a08c7bb7a3653c1"; + sha256 = "sha256-BqCVe7dY6WNJZS2XTNcnvB9d+HoM0wUItmmVskEaVHQ="; + }; + meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/"; + }; + tinykeymap = buildVimPlugin { pname = "tinykeymap"; version = "2024-02-17"; @@ -18624,6 +18720,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; + unimpaired-nvim = buildVimPlugin { + pname = "unimpaired.nvim"; + version = "2024-10-17"; + src = fetchFromGitHub { + owner = "tummetott"; + repo = "unimpaired.nvim"; + rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534"; + sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg="; + }; + meta.homepage = "https://github.com/tummetott/unimpaired.nvim/"; + }; + vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; version = "2024-08-16"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 62c42151f8..097a866271 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -403,12 +403,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=07a647c"; + version = "0.0.0+rev=16c9cb9"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "07a647c8fb70e6b06379a60526721e3141aa2fd2"; - hash = "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8="; + rev = "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"; + hash = "sha256-UVxLF4IKRXexz+PbSlypS/1QsWXkS/iYVbgmFCgjvZM="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -526,12 +526,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=79bb1dc"; + version = "0.0.0+rev=f5b5ac3"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "79bb1dc197d0eb7499843b19d3dd0f9a2ee34d3c"; - hash = "sha256-A58dlaDQBmufKT/yG+At0NN0Op6gbEU47DvHjpzklwg="; + rev = "f5b5ac3f718523fe9d5ee926f64eb177306afdb6"; + hash = "sha256-l5ryC0wINO/oN8FNrngR7QnDAhiX65y0Hw5AExvAfBo="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -559,12 +559,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=827d15d"; + version = "0.0.0+rev=2ac7a0f"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "827d15deada6ca2f40eece82d1bbe65df07af954"; - hash = "sha256-yKeSOH1/6R1km3vzIZurVwVE1hxVoGMBCFGHkHFkt20="; + rev = "2ac7a0f81f0731d83068b2872c4a8fee39263a85"; + hash = "sha256-u0gwq4eIoFNcTeoJpY2lRE97M7JSHZ5X2zSKrNlTycM="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -735,12 +735,12 @@ }; fsharp = buildGrammar { language = "fsharp"; - version = "0.0.0+rev=5202637"; + version = "0.0.0+rev=971da5f"; src = fetchFromGitHub { owner = "ionide"; repo = "tree-sitter-fsharp"; - rev = "5202637c203fcf8876affbd18b04ff43256d4c4a"; - hash = "sha256-OjCwEhTACaVcnR/NyfUGZN/juLUHgqY6h+3DSrqUuiQ="; + rev = "971da5ff0266bfe4a6ecfb94616548032d6d1ba0"; + hash = "sha256-0jrbznAXcjXrbJ5jnxWMzPKxRopxKCtoQXGl80R1M0M="; }; location = "fsharp"; meta.homepage = "https://github.com/ionide/tree-sitter-fsharp"; @@ -846,12 +846,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=79fdc5d"; + version = "0.0.0+rev=67ab180"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "79fdc5de52d0e2c6854db924525196af22100dad"; - hash = "sha256-SvYMfldARrwhte6lJrCwpVaBjCerCsYwL4Z+qjdhHKs="; + rev = "67ab180883ba5ce3f5b0a5f4288cc6d9f9d83a5d"; + hash = "sha256-5ieeIuUcaky3gWcrCrPXEGzfqom3Kv6rR8CEaWk797k="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -890,23 +890,23 @@ }; glimmer_javascript = buildGrammar { language = "glimmer_javascript"; - version = "0.0.0+rev=a260911"; + version = "0.0.0+rev=7e8ea8c"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-javascript"; - rev = "a260911201684f80cf815418b3771e6c39309f81"; - hash = "sha256-fpVlfYjVI1ricwNfuzI5AV3RV4ijFTYOf/2NhCirCvU="; + rev = "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3"; + hash = "sha256-gqadIB5tB7aIOl3g6pxDeOsuENAwzb5RLVFn4d0G9MY="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; }; glimmer_typescript = buildGrammar { language = "glimmer_typescript"; - version = "0.0.0+rev=9d018a0"; + version = "0.0.0+rev=4006128"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-typescript"; - rev = "9d018a0f93417e6951264a26093b89ee63df7315"; - hash = "sha256-ZV6q4OEwj0ulGh5PO5XEMvT4WJQHkMmMXFJs8mcJqXk="; + rev = "4006128790efb58ca82a4492d8ef0983b260fc6a"; + hash = "sha256-oOF36q09hcOCdFWrFQlhDX79tS9xBNVgcp1vmxjRdGM="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; @@ -1042,6 +1042,17 @@ }; meta.homepage = "https://github.com/bkegley/tree-sitter-graphql"; }; + gren = buildGrammar { + language = "gren"; + version = "0.0.0+rev=c06e272"; + src = fetchFromGitHub { + owner = "MaeBrooks"; + repo = "tree-sitter-gren"; + rev = "c06e272341363c5d8e19ac34bc7c56258a37e71b"; + hash = "sha256-Zxa/5hTFrkVRzswKion1tzrwp//ASuZKQjw7g/znBsI="; + }; + meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren"; + }; groovy = buildGrammar { language = "groovy"; version = "0.0.0+rev=0d88845"; @@ -1309,12 +1320,12 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=3f86793"; + version = "0.0.0+rev=b864ed9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "3f8679368cf00ed10ec086975fa87f697b91b7bc"; - hash = "sha256-Mkh3zwZmErBEwzQ1yLTo9kyEhSZm6WigXtWKZpPYyXY="; + rev = "b864ed97b9675e86de7c15a70c12e4c1ca85fbf9"; + hash = "sha256-CiWIh8IFmK1xW7DfERWqsnFjtveAevANlzJbPOwA7Z0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; @@ -1353,12 +1364,12 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=8bfdb43"; + version = "0.0.0+rev=f2503f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"; - hash = "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0="; + rev = "f2503f1c437fe24560876557868ac94c9cfd3216"; + hash = "sha256-9tkKDvVB5YHqtIiBqrCRGp4H9MwapC1mHrm86iytiz4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1629,24 +1640,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=b7eba93"; + version = "0.0.0+rev=be81c59"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "b7eba93e6a3e588e259e831416ac11abdaa8616a"; - hash = "sha256-lOLLHHMmNAtK+RLOSIt0GpeNRiMj3eu9jhSKS0HT370="; + rev = "be81c59efc552bd875650fe078bf6b78d57330ca"; + hash = "sha256-gqZYUJWijD0UQAQeElx/VxAILI2WZtvC/+Eno3AiCTU="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=b7eba93"; + version = "0.0.0+rev=be81c59"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "b7eba93e6a3e588e259e831416ac11abdaa8616a"; - hash = "sha256-lOLLHHMmNAtK+RLOSIt0GpeNRiMj3eu9jhSKS0HT370="; + rev = "be81c59efc552bd875650fe078bf6b78d57330ca"; + hash = "sha256-gqZYUJWijD0UQAQeElx/VxAILI2WZtvC/+Eno3AiCTU="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1943,24 +1954,24 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=69af07e"; + version = "0.0.0+rev=2bce5a6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "69af07eedf60bc1992c59a8fd6b5e41f25442715"; - hash = "sha256-uS5MTotJypsawMR1z/KmZCNxfTuFIyimqbms5IEJ0cE="; + rev = "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b"; + hash = "sha256-0yWXwRc0cMMLL8P99eW3BwYIrm6FDG7eBNfjmIDzZIU="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=69af07e"; + version = "0.0.0+rev=2bce5a6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "69af07eedf60bc1992c59a8fd6b5e41f25442715"; - hash = "sha256-uS5MTotJypsawMR1z/KmZCNxfTuFIyimqbms5IEJ0cE="; + rev = "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b"; + hash = "sha256-0yWXwRc0cMMLL8P99eW3BwYIrm6FDG7eBNfjmIDzZIU="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -2322,12 +2333,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=123552e"; + version = "0.0.0+rev=58f4caf"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "123552e5849fae9a7c536eac84d471579c7f3328"; - hash = "sha256-qcVZHrhlx66usrG5aapYdyv8Tx2wK4ZivjzsDNLpmsY="; + rev = "58f4caf9db12db3b38b81c77d274aa73c9e85aca"; + hash = "sha256-IeAp2fEdxVf8r/f8B85ex5Y5DL8Z1ZOqovjVyMBIOKM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2454,12 +2465,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=2cfbb6e"; + version = "0.0.0+rev=a9af635"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e"; - hash = "sha256-8s5Li+fuHyr19KYaC/UzXc7ASLimwAu1VS+8lc5rNLA="; + rev = "a9af6356f8e31f04e870587bca79bc2b15808ff5"; + hash = "sha256-nZUQh42OsPnQffixOklbAmAIGtct/AaKOn4fE6ndTfQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2700,12 +2711,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=36f37aa"; + version = "0.0.0+rev=3325bbb"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "36f37aa5aa440805f27d4a9f5203e616a303c6a1"; - hash = "sha256-oegEpBCk7Fhx4SbXebBq33b7Ef9XshYfx2SciaKwINY="; + rev = "3325bbb2dda260131a8db0cae1f1f557d17ebced"; + hash = "sha256-3NAS3eqayFYRziryNgOWfY+3d1HcVe+jPcKkkL9jbWY="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2723,12 +2734,12 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=774a65a"; + version = "0.0.0+rev=ae5199d"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "774a65aea563accc35f5d45fafa4d96ec5761f57"; - hash = "sha256-mkw3s0pZQ6ry+fiTk2fJeKVA7Nqyv2Z2R1AFZknzpFM="; + rev = "ae5199db47757f785e43a14b332118a5474de1a2"; + hash = "sha256-cH9h7i6MImw7KlcuVQ6XVKNjd9dFjo93J1JdTWmEpV4="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; @@ -2766,25 +2777,14 @@ }; meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; }; - systemverilog = buildGrammar { - language = "systemverilog"; - version = "0.0.0+rev=4f897d5"; - src = fetchFromGitHub { - owner = "zhangwwpeng"; - repo = "tree-sitter-systemverilog"; - rev = "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"; - hash = "sha256-guNdS07QqbqegFICNHP1ECX9bc+ZCW9li3ILIZVHRwM="; - }; - meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; - }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=6182836"; + version = "0.0.0+rev=0f6a5b1"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "6182836f4128725f1e74ce986840d7317021a015"; - hash = "sha256-w9X/CL5X6Lwr4/GGVQcMZ1O2HfJmdNiVjRQKGZHrRqg="; + rev = "0f6a5b1e031c97ebf58d3c76eadb2c6bf1e4f780"; + hash = "sha256-Pd6rudBmDVvBwlVSLtBmSsoOBU9aG0iSyEPbTaYX6JE="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2858,12 +2858,12 @@ }; textproto = buildGrammar { language = "textproto"; - version = "0.0.0+rev=d900077"; + version = "0.0.0+rev=568471b"; src = fetchFromGitHub { owner = "PorterAtGoogle"; repo = "tree-sitter-textproto"; - rev = "d900077aef9f5dcb0d47c86be33585013ed5db9a"; - hash = "sha256-PZMhYhIpGa7Y50jxvXZ0Z5l9e26P5q55sC18ptDi/uU="; + rev = "568471b80fd8793d37ed01865d8c2208a9fefd1b"; + hash = "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ="; }; meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto"; }; @@ -3116,14 +3116,14 @@ }; verilog = buildGrammar { language = "verilog"; - version = "0.0.0+rev=5a01c57"; + version = "0.0.0+rev=0dacb91"; src = fetchFromGitHub { - owner = "tree-sitter"; - repo = "tree-sitter-verilog"; - rev = "5a01c57fa8e3d8801953a67ae7c6b240e2284ee8"; - hash = "sha256-Q8RaoL/1vNd553VFOI8crRffV8iVmAnMVCC+O2zjEZU="; + owner = "gmlarumbe"; + repo = "tree-sitter-systemverilog"; + rev = "0dacb911daa9614a7c7e79a594d4cb9f478e6554"; + hash = "sha256-WATrVeP3c//tWLG8VibXZrYrChBs7d4V6LCcEGcofdg="; }; - meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; + meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog"; }; vhdl = buildGrammar { language = "vhdl"; @@ -3204,12 +3204,12 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=0f06f24"; + version = "0.0.0+rev=47c1818"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "0f06f24e259ac725045956436b9025dab008ff9f"; - hash = "sha256-/HNDdI2Tg6YG/lAvubZtN2g6pUCk0Kl4kRTRsABIm0Y="; + rev = "47c1818d245a6156a488c4c4d06e9336714bae9b"; + hash = "sha256-oL9HDMDl6MgDLZw4NWtdX7W775JZKwD2BweAO+9iI/k="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 4a58f44942..d977d0ac9d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -199,6 +199,8 @@ in meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; + blink-cmp = callPackage ./blink-cmp { }; + # The GitHub repository returns 404, which breaks the update script vim-pony = buildVimPlugin { pname = "vim-pony"; @@ -1112,6 +1114,11 @@ in }; }; + hunk-nvim = super.hunk-nvim.overrideAttrs { + dependencies = with self; [ nui-nvim ]; + nvimRequireCheck = "hunk"; + }; + # https://hurl.dev/ hurl = buildVimPlugin { pname = "hurl"; @@ -1669,6 +1676,10 @@ in nvim-treesitter-parsers = lib.recurseIntoAttrs self.nvim-treesitter.grammarPlugins; + nvim-treesitter-sexp = super.nvim-treesitter-sexp.overrideAttrs { + nvimRequireCheck = "treesitter-sexp"; + }; + nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = with self; [ promise-async ]; nvimRequireCheck = "ufo"; @@ -1854,6 +1865,10 @@ in nvimRequireCheck = "rustaceanvim"; }; + scretch-nvim = super.scretch-nvim.overrideAttrs { + nvimRequireCheck = "scretch"; + }; + sg-nvim = super.sg-nvim.overrideAttrs ( old: let @@ -2734,7 +2749,6 @@ in "coc-lists" "coc-ltex" "coc-markdownlint" - "coc-metals" "coc-pairs" "coc-prettier" "coc-r-lsp" @@ -2751,8 +2765,6 @@ in "coc-tabnine" "coc-texlab" "coc-toml" - "coc-tslint" - "coc-tslint-plugin" "coc-tsserver" "coc-ultisnips" "coc-vetur" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch index 496df312b4..b784c10387 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch @@ -1,17 +1,26 @@ diff --git a/lua/ranger-nvim.lua b/lua/ranger-nvim.lua -index 3b18880..78eb9db 100644 +index be95e36..3bd1587 100644 --- a/lua/ranger-nvim.lua +++ b/lua/ranger-nvim.lua -@@ -109,7 +109,7 @@ local function build_ranger_cmd(select_current_file) - end +@@ -127,7 +127,7 @@ local function build_ranger_cmd(select_current_file) local selectfile_flag = select_current_file and " --selectfile=" .. selected_file or "" - return string.format( -- "ranger --choosefiles=%s %s %s", -+ "@ranger@ --choosefiles=%s %s %s", - SELECTED_FILEPATH, - selectfile_flag, - create_ranger_cmd_flags(create_cmd_values(opts.keybinds)) -@@ -182,7 +182,7 @@ end + if select_current_file then + return string.format( +- "ranger --choosefiles=%s %s %s", ++ "@ranger@ --choosefiles=%s %s %s", + SELECTED_FILEPATH, + selectfile_flag, + create_ranger_cmd_flags(create_cmd_values(opts.keybinds)) +@@ -135,7 +135,7 @@ local function build_ranger_cmd(select_current_file) + else + vim.api.nvim_buf_delete(1, { force = true }) + return string.format( +- "ranger --choosefiles=%s %s %s", ++ "@ranger@ --choosefiles=%s %s %s", + SELECTED_FILEPATH, + create_ranger_cmd_flags(create_cmd_values(opts.keybinds)), + get_absolute_argument() +@@ -209,7 +209,7 @@ end ---Opens ranger and open selected files on exit. ---@param select_current_file boolean|nil open ranger and select the current file. Defaults to true. function M.open(select_current_file) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index c4d547e962..07f334bdaa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -53,6 +53,7 @@ https://github.com/joshuavial/aider.nvim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, +https://github.com/Vonr/align.nvim/,HEAD, https://github.com/goolord/alpha-nvim/,HEAD, https://github.com/anuvyklack/animation.nvim/,HEAD, https://github.com/Olical/aniseed/,, @@ -338,6 +339,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, https://github.com/akinsho/flutter-tools.nvim/,HEAD, +https://github.com/nvim-focus/focus.nvim/,HEAD, https://github.com/anuvyklack/fold-preview.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, @@ -419,6 +421,7 @@ https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, +https://github.com/julienvincent/hunk.nvim/,HEAD, https://github.com/nvimtools/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, @@ -457,6 +460,7 @@ https://github.com/Myzel394/jsonfly.nvim/,HEAD, https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/GCBallesteros/jupytext.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, +https://github.com/imsnif/kdl.vim/,HEAD, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, https://github.com/kmonad/kmonad-vim/,, https://github.com/frabjous/knap/,HEAD, @@ -730,6 +734,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, https://github.com/chrisgrieser/nvim-genghis/,HEAD, +https://github.com/booperlv/nvim-gomove/,HEAD, https://github.com/smiteshp/nvim-gps/,, https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, https://github.com/Iron-E/nvim-highlite/,, @@ -784,8 +789,10 @@ https://github.com/nvim-tree/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, +https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, +https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD, https://github.com/windwp/nvim-ts-autotag/,, @@ -899,6 +906,7 @@ https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, https://github.com/davidgranstrom/scnvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD, +https://github.com/0xJohnnyboy/scretch.nvim/,HEAD, https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/cakebaker/scss-syntax.vim/,, https://github.com/VonHeikemen/searchbox.nvim/,, @@ -1053,6 +1061,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/tummetott/unimpaired.nvim/,HEAD, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, https://github.com/sontungexpt/url-open/,HEAD, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index f8fc458aef..33bc3153b7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -656,7 +656,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes"; homepage = "https://github.com/mjbvz/vscode-markdown-footnotes"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -689,7 +689,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles"; homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -710,7 +710,7 @@ let # or asl20 ]; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -727,7 +727,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish"; homepage = "https://github.com/bmalehorn/vscode-fish"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -1793,7 +1793,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github"; homepage = "https://github.com/fabiospampinato/vscode-open-in-github"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -1930,7 +1930,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran"; homepage = "https://github.com/fortran-lang/vscode-fortran-support"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -2844,7 +2844,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint"; homepage = "https://github.com/kravetsone/vscode-publint"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -3069,7 +3069,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter"; homepage = "https://github.com/meganrogge/template-string-converter"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -3605,7 +3605,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl"; homepage = "https://code.visualstudio.com/docs/remote/wsl"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -3716,7 +3716,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax"; homepage = "https://github.com/nefrob/vscode-just"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -4455,7 +4455,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=sswg.swift-lang"; homepage = "https://github.com/swiftlang/vscode-swift"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -5076,7 +5076,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer"; homepage = "https://github.com/vitaliymaz/vscode-svg-previewer"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -5408,7 +5408,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors"; homepage = "https://github.com/yoavbls/pretty-ts-errors"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -5495,7 +5495,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons"; homepage = "https://github.com/zguolee/vscode-tabler-icons"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index d1dcbafac6..961f2fac25 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-CQVujtl1SFcUmEG7O1cvN2gr6v3kcWMMZz+oYEkclKI="; + hash = "sha256-NQ7LsX8/1h7sSI5mPdDgu4MVc29iNJ1vl0K7fMCBmlc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/fceux/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/fceux/default.nix deleted file mode 100644 index c5b3188b3c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/fceux/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, SDL2 -, cmake -, fetchFromGitHub -, lua -, minizip -, pkg-config -, stdenv -, wrapQtAppsHook -, x264 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "fceux"; - version = "2.6.6-unstable-2024-01-19"; - - src = fetchFromGitHub { - owner = "TASEmulators"; - repo = "fceux"; - rev = "2fce5ffe745bb89be471e450d9cd6284cd5614d9"; - hash = "sha256-5uUTw7ZkmBrGuntSQFNAp1Xz69ANmmIxNGd0/enPoW8="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - SDL2 - lua - minizip - x264 - ]; - - meta = { - homepage = "http://www.fceux.com/"; - description = "Nintendo Entertainment System (NES) Emulator"; - mainProgram = "fceux"; - changelog = "https://github.com/TASEmulators/blob/fceux/${finalAttrs.src.rev}/changelog.txt"; - license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres sbruder ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix index 6ad01c1563..39f69c62b2 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -10,6 +10,7 @@ , which , musl-fts , pcre +, gnused # options , conf ? null , withIcons ? false @@ -60,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withPcre [ "O_PCRE=1" ] ++ extraMakeFlags; - binPath = lib.makeBinPath [ file which ]; + binPath = lib.makeBinPath [ file which gnused ]; installTargets = [ "install" "install-desktop" ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix index 8c26be6bb2..092e86edcb 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { for use by GMT, the Generic Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; } diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix index 9eb1bde426..2f2528ff5b 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix @@ -106,7 +106,7 @@ in stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.unix; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; }) diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix index 62758c71d5..d51f1dbbcb 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 8625f30568..aa613ef09a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ erictapen dotlambda rhendric ]; + maintainers = with maintainers; [ dotlambda rhendric ]; license = licenses.asl20; mainProgram = "magick"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index a0c1776a69..5b551da388 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -116,9 +116,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop application for creating diagrams"; homepage = "https://about.draw.io/"; - license = licenses.asl20; + license = licenses.unfree; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ qyliss darkonion0 ]; + maintainers = with maintainers; [ darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; mainProgram = "drawio"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix index d71c1999fa..1ccbc136c7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2023-07-16"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - hash = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; + hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix index 7104600545..aba7f561fb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix @@ -1,7 +1,8 @@ -{ mkDerivation -, lib +{ lib , stdenv , fetchFromGitLab +, fetchurl +, makeDesktopItem , cmake , boost , bzip2 @@ -17,21 +18,27 @@ , qtsvg , qttools , VideoDecodeAcceleration +, wrapQtAppsHook +, copyDesktopItems +# needed to run natively on wayland +, qtwayland }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ovito"; - version = "3.7.11"; + version = "3.11.0"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - hash = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; + hash = "sha256-egiA6z1e8ZS7i4CIVjsCKJP1wQSRpmSKitoVTszu0Mc="; }; nativeBuildInputs = [ cmake + wrapQtAppsHook + copyDesktopItems ]; buildInputs = [ @@ -48,16 +55,42 @@ mkDerivation rec { qtbase qtsvg qttools + qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoDecodeAcceleration ]; + # manually create a desktop file + desktopItems = [ (makeDesktopItem { + name = "ovito"; + comment= "Open Visualization Tool"; + exec = "ovito"; + icon = "ovito"; + terminal = false; + startupNotify = false; + desktopName = "ovito"; + startupWMClass = "Ovito"; + categories = [ "Science" ]; + })]; + + postInstall = let + icon = fetchurl { + url = "https://www.ovito.org/wp-content/uploads/logo_rgb-768x737.png"; + hash = "sha256-FOmIUeXem+4MjavQNag0UIlcR2wa2emJjivwxoJh6fI="; + }; + in '' + install -Dm644 ${icon} $out/share/pixmaps/ovito.png + ''; + meta = with lib; { description = "Scientific visualization and analysis software for atomistic and particle simulation data"; mainProgram = "ovito"; homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; - maintainers = with maintainers; [ twhitehead ]; + maintainers = with maintainers; [ + twhitehead + chn + ]; broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix index bfd707f551..a38c247e7f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix @@ -1,30 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms -, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk3, libpng, exiv2, lcms +, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl, wrapGAppsHook3, webp-pixbuf-loader, gnome, librsvg}: stdenv.mkDerivation rec { - pname = "viewnior"; - version = "1.8"; + pname = "viewnior-gtk3"; + version = "1.8-unstable-2023-11-23"; src = fetchFromGitHub { - owner = "hellosiyan"; + #owner = "hellosiyan"; + #repo = "Viewnior"; + owner = "Artturin"; repo = "Viewnior"; - rev = "${pname}-${version}"; - hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; + # https://github.com/hellosiyan/Viewnior/pull/142 + rev = "23ce6e5630b24509d8009f17a833ad9e59b85fab"; + hash = "sha256-+/f0+og1Dd7eJK7P83+q4lf4SjzW2g6qNk8ZTxNAuDA="; }; - patches = [ - (fetchpatch { - name = "viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-O3/d7qMiOsYJmz7ekoLM6oaHcuYjEbAfPFuDUWSybfE="; - }) - (fetchpatch { - name = "viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-Zjc4CIlelAkbyvX2F1yo/qJjUajtAgF4+FoHWFEIPWY="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -32,10 +22,11 @@ stdenv.mkDerivation rec { desktop-file-utils intltool gettext + wrapGAppsHook3 ]; buildInputs = [ - gtk2 + gtk3 libpng exiv2 lcms @@ -45,6 +36,23 @@ stdenv.mkDerivation rec { perl ]; + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + webp-pixbuf-loader + librsvg + ]; + } + }" + + # gtk3 viewnior can be launched in wayland mode and does so by default + # but moving around in a zoomed in image doesn't work + gappsWrapperArgs+=( + --set-default GDK_BACKEND x11 + ) + ''; + meta = with lib; { description = "Fast and simple image viewer"; longDescription = diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index 921fef4562..64ce75717e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -1,39 +1,42 @@ -{ lib, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, cmake -, gettext -, wrapGAppsHook3 -, pkg-config + cmake, + gettext, + wrapGAppsHook3, + pkg-config, -, adwaita-icon-theme -, alsa-lib -, binutils -, glib -, gsettings-desktop-schemas -, gtk3 -, gtksourceview4 -, librsvg -, libsndfile -, libxml2 -, libzip -, pcre -, poppler -, portaudio -, zlib -# plugins -, withLua ? true, lua + adwaita-icon-theme, + alsa-lib, + binutils, + glib, + gsettings-desktop-schemas, + gtk3, + gtksourceview4, + librsvg, + libsndfile, + libxml2, + libzip, + pcre, + poppler, + portaudio, + zlib, + # plugins + withLua ? true, + lua, }: stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY="; + hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk="; }; postPatch = '' @@ -41,12 +44,18 @@ stdenv.mkDerivation rec { --replace-fail "addr2line" "${binutils}/bin/addr2line" ''; - nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapGAppsHook3 + ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ [ + ] + ++ [ glib gsettings-desktop-schemas gtk3 @@ -72,11 +81,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; - homepage = "https://xournalpp.github.io/"; - changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; + homepage = "https://xournalpp.github.io/"; + changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + platforms = platforms.unix; mainProgram = "xournalpp"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/cantor.nix b/third_party/nixpkgs/pkgs/applications/kde/cantor.nix index 1805ed8a52..6af2b207ed 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/cantor.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/cantor.nix @@ -1,46 +1,56 @@ -{ lib -, mkDerivation +{ + lib, + mkDerivation, -, cmake -, extra-cmake-modules -, makeWrapper -, shared-mime-info + cmake, + extra-cmake-modules, + makeWrapper, + shared-mime-info, -, qtbase -, qtsvg -, qttools -, qtwebengine -, qtxmlpatterns + fetchpatch, + qtbase, + qtsvg, + qttools, + qtwebengine, + qtxmlpatterns, -, poppler + poppler, -, karchive -, kcompletion -, kconfig -, kcoreaddons -, kcrash -, kdoctools -, ki18n -, kiconthemes -, kio -, knewstuff -, kparts -, kpty -, ktexteditor -, ktextwidgets -, kxmlgui -, syntax-highlighting + karchive, + kcompletion, + kconfig, + kcoreaddons, + kcrash, + kdoctools, + ki18n, + kiconthemes, + kio, + knewstuff, + kparts, + kpty, + ktexteditor, + ktextwidgets, + kxmlgui, + syntax-highlighting, -, libspectre + libspectre, -# Backends. Set to null if you want to omit from the build -, withAnalitza ? true, analitza -, wtihJulia ? true, julia -, withQalculate ? true, libqalculate -, withLua ? true, luajit -, withPython ? true, python3 -, withR ? true, R -, withSage ? true, sage, sage-with-env ? sage.with-env + # Backends. Set to null if you want to omit from the build + withAnalitza ? true, + analitza, + wtihJulia ? true, + julia, + withQalculate ? true, + libqalculate, + withLua ? true, + luajit, + withPython ? true, + python3, + withR ? true, + R, + withSage ? true, + sage, + sage-with-env ? sage.with-env, }: mkDerivation { @@ -54,42 +64,42 @@ mkDerivation { qttools ]; - buildInputs = [ - qtbase - qtsvg - qtwebengine - qtxmlpatterns + buildInputs = + [ + qtbase + qtsvg + qtwebengine + qtxmlpatterns - poppler + poppler - karchive - kcompletion - kconfig - kcoreaddons - kcrash - kdoctools - ki18n - kiconthemes - kio - knewstuff - kparts - kpty - ktexteditor - ktextwidgets - kxmlgui - syntax-highlighting + karchive + kcompletion + kconfig + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kio + knewstuff + kparts + kpty + ktexteditor + ktextwidgets + kxmlgui + syntax-highlighting - libspectre - ] - # backends - ++ lib.optional withAnalitza analitza - ++ lib.optional wtihJulia julia - ++ lib.optional withQalculate libqalculate - ++ lib.optional withLua luajit - ++ lib.optional withPython python3 - ++ lib.optional withR R - ++ lib.optional withSage sage-with-env - ; + libspectre + ] + # backends + ++ lib.optional withAnalitza analitza + ++ lib.optional wtihJulia julia + ++ lib.optional withQalculate libqalculate + ++ lib.optional withLua luajit + ++ lib.optional withPython python3 + ++ lib.optional withR R + ++ lib.optional withSage sage-with-env; qtWrapperArgs = [ "--prefix PATH : ${placeholder "out"}/bin" @@ -98,10 +108,24 @@ mkDerivation { # Causes failures on Hydra and ofborg from some reason enableParallelBuilding = false; - meta = with lib; { + patches = [ + # fix build for julia 1.1 from upstream + (fetchpatch { + url = "https://github.com/KDE/cantor/commit/ed9525ec7895c2251668d11218f16f186db48a59.patch?full_index=1"; + hash = "sha256-paq0e7Tl2aiUjBf1bDHLLUpShwdCQLICNTPNsXSoe5M="; + }) + ]; + + meta = { description = "Front end to powerful mathematics and statistics packages"; homepage = "https://cantor.kde.org/"; - license = with licenses; [ bsd3 cc0 gpl2Only gpl2Plus gpl3Only ]; - maintainers = with maintainers; [ hqurve ]; + license = with lib.licenses; [ + bsd3 + cc0 + gpl2Only + gpl2Plus + gpl3Only + ]; + maintainers = with lib.maintainers; [ hqurve ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index cecb229ce1..d91f48f82d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -10,43 +10,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.40" else "8.10.44-21.BETA"; + version = if channel == "stable" then "8.10.46" else "8.10.48-17.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-viY0SOUhrOvmue6Nolau356rIqwDo2nLzMilFFmNb9g="; + hash = "sha256-oewS90rSBqxA0V+ttcmUXznUZ3+mb5FKtmYD4kUDmTk="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw="; + hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I="; + hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A="; + hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-enorJfbn+xJVy1fG3wjhO3LkSsMncHA9/yA13kG+h4Y="; + hash = "sha256-4SPZJP/ebnyAMEWrIGonb+5nYXuM8KCPK9modC/Cr/Y="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-EUnIIi6DB5kBVid9ExBpNApKItHnRKQziBy/GFt0xag="; + hash = "sha256-V5Nt81Trw6l7DAUtCX2Yv/fL2wBJpJER0iaOBmMfQ5o="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc="; + hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0="; + hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A="; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index e6b2fabd24..e6788abeca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "CopyQ"; - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-Dxiytspqs4+bcnUM+B3lO8iQp9rrCvMfI+WMFMCtM7g="; + hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 0faaf36912..50c6c9ac94 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, fetchFromGitHub +, protobuf , wrapQtAppsHook , python3 , zbar @@ -9,28 +9,9 @@ , enableQt ? true , callPackage , qtwayland -, fetchPypi }: let - version = "4.5.5"; - - python = python3.override { - self = python; - packageOverrides = self: super: { - # Pin ledger-bitcoin to 0.2.1 - ledger-bitcoin = super.ledger-bitcoin.overridePythonAttrs (oldAttrs: rec { - version = "0.2.1"; - format = "pyproject"; - src = fetchPypi { - pname = "ledger_bitcoin"; - inherit version; - hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; - }; - }); - }; - }; - libsecp256k1_name = if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" @@ -41,39 +22,21 @@ let else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; - # Not provided in official source releases, which are what upstream signs. - tests = fetchFromGitHub { - owner = "spesmilo"; - repo = "electrum"; - rev = version; - sha256 = "sha256-CbhI/q+zjk9odxuvdzpogi046FqkedJooiQwS+WAkJ8="; - - postFetch = '' - mv $out ./all - mv ./all/tests $out - ''; - }; - in -python.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "electrum"; - inherit version; + version = "4.5.6"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1jiagz9avkbd158pcip7p4wz0pdsxi94ndvg5p8afvshb32aqwav"; + hash = "sha256-LO2ZUvbDJaIxrdgA+cM3sGgqJ+N+UlA9ObNINQcrorA="; }; - postUnpack = '' - # can't symlink, tests get confused - cp -ar ${tests} $sourceRoot/tests - ''; - - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + build-system = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -104,7 +67,7 @@ python.pkgs.buildPythonApplication { qdarkstyle ]; - checkInputs = with python.pkgs; lib.optionals enableQt [ + checkInputs = with python3.pkgs; lib.optionals enableQt [ pyqt6 ]; @@ -136,7 +99,7 @@ python.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - nativeCheckInputs = with python.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "tests" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 0a6e43f9e1..8efda60708 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.4"; + version = "1.30.5"; src = fetchurl { name = "fluidd-v${version}.zip"; - url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-r9RYNfbMa0axxS5kVBsFmvnuznsZz4s0ZfsIJVczHlI="; + url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip"; + sha256 = "sha256-Ry9aD8pSFw076yIywik0ov+ZPNRsI9srM4YJBW/1bY8="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix deleted file mode 100644 index aa1a3cd46b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, popt }: - -let - version = "0.9.2"; -in - -stdenv.mkDerivation rec { - pname = "gmrun"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz"; - sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 popt ]; - - doCheck = true; - - enableParallelBuilding = true; - - patches = [ - ./gcc43.patch - ./find-config-file-in-system-etc-dir.patch - ./gmrun-0.9.2-xdg.patch - ]; - - meta = with lib; { - description = "Gnome Completion-Run Utility"; - longDescription = '' - A simple program which provides a "run program" window, featuring a bash-like TAB completion. - It uses GTK interface. - Also, supports CTRL-R / CTRL-S / "!" for searching through history. - Running commands in a terminal with CTRL-Enter. URL handlers. - ''; - homepage = "https://sourceforge.net/projects/gmrun/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.all; - mainProgram = "gmrun"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch b/third_party/nixpkgs/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch deleted file mode 100644 index 12d5370961..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur gmrun-0.9.2-orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc ---- gmrun-0.9.2-orig/src/prefs.cc 2019-05-02 12:56:39.025088361 +0200 -+++ gmrun-0.9.2/src/prefs.cc 2019-05-02 13:21:51.179778620 +0200 -@@ -31,9 +31,11 @@ - - Prefs::Prefs() - { -- string file_name = PACKAGE_DATA_DIR"/"; -- file_name += GMRUNRC; -- init(file_name); -+ string file_name = "/etc/" GMRUNRC; -+ if (!init(file_name)) { -+ file_name = PACKAGE_DATA_DIR "/" GMRUNRC;; -+ init(file_name); -+ } - - file_name = getenv("HOME"); - if (!file_name.empty()) { diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmrun/gcc43.patch b/third_party/nixpkgs/pkgs/applications/misc/gmrun/gcc43.patch deleted file mode 100644 index 60e4338e89..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gmrun/gcc43.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100 -+++ a/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - using namespace std; - ---- a/src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200 -+++ a/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200 -@@ -7,6 +7,7 @@ - #define __CI_STRING_H__ - - #include -+#include - #include - - struct ci_char_traits : public std::char_traits ---- a/src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200 -+++ a/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - ---- a/src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100 -+++ a/src/main.cc 2008-05-08 09:03:11.000000000 +0200 -@@ -14,6 +14,7 @@ - #include - - #include -+#include - #include - #include - #include - ---- a/src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400 -+++ a/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400 -@@ -376,7 +377,7 @@ - return 0; - } - --int my_alphasort(const void* va, const void* vb) { -+int my_alphasort(const dirent** va, const dirent** vb) { - const struct dirent** a = (const struct dirent**)va; - const struct dirent** b = (const struct dirent**)vb; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch b/third_party/nixpkgs/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch deleted file mode 100644 index b5cd41a3c5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ur a/src/history.cc src/history.cc ---- a/src/history.cc 2002-08-17 15:19:31.000000000 +0200 -+++ a/src/history.cc 2012-06-04 23:42:35.314653414 +0200 -@@ -24,8 +24,15 @@ - HistoryFile::HistoryFile() - { - m_file_entries = 0; -- m_filename = g_get_home_dir(); -- m_filename += "/.gmrun_history"; -+ const char* filename = getenv("XDG_CACHE_HOME"); -+ if (filename != 0 && *filename != '\0') { -+ m_filename = filename; -+ m_filename += "/gmrun_history"; -+ } -+ else { -+ m_filename = g_get_home_dir(); -+ m_filename += "/.gmrun_history"; -+ } - m_current = 0; - m_default_set = false; - read_the_file(); -diff -ur a/src/prefs.cc src/prefs.cc ---- a/src/prefs.cc 2012-06-04 22:35:00.671949439 +0200 -+++ a/src/prefs.cc 2012-06-04 23:24:24.184445962 +0200 -@@ -35,12 +35,29 @@ - file_name += GMRUNRC; - init(file_name); - -- file_name = getenv("HOME"); -- if (!file_name.empty()) { -+ file_name.clear(); -+ const char* filename = getenv("XDG_CONFIG_HOME"); -+ if (filename != 0 && *filename != '\0') { -+ file_name = filename; - string::iterator i = file_name.end() - 1; -- if (*i == '/') file_name.erase(i); -- file_name += "/."; -+ if (*i != '/') { -+ file_name += '/'; -+ } - file_name += GMRUNRC; -+ } -+ else { -+ filename = getenv("HOME"); -+ if (filename != 0 && *filename != '\0') { -+ file_name = filename; -+ string::iterator i = file_name.end() - 1; -+ if (*i != '/') { -+ file_name += '/'; -+ } -+ file_name += '.'; -+ file_name += GMRUNRC; -+ } -+ } -+ if (!file_name.empty()) { - init(file_name); - } - } diff --git a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index 0c457655c4..e642cecf69 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation { done ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient + ln -s $opt/x86_64/HubstaffCLI.bin.x86_64 $out/bin/HubstaffCLI # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources diff --git a/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix index 9f40735771..a826afefc6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake @@ -22,21 +22,22 @@ , qtbase , qttools , wrapGAppsHook3 +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "input-leap"; - version = "unstable-2023-12-27"; + version = "3.0.2"; src = fetchFromGitHub { owner = "input-leap"; repo = "input-leap"; - rev = "ecf1fb6645af7b79e6ea984d3c9698ca0ab6f391"; - hash = "sha256-TEv1xR1wUG3wXNATLLIZKOtW05X96wsPNOlE77OQK54="; + rev = "v${version}"; + hash = "sha256-YkBHvwN573qqQWe/p0n4C2NlyNQHSZNz2jyMKGPITF4="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 qttools ]; + nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 wrapQtAppsHook qttools ]; buildInputs = [ curl qtbase avahi libX11 libXext libXtst libXinerama libXrandr libXdmcp libICE libSM diff --git a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix index 7471d7ce5e..82b30866f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.9"; + version = "2.0.11"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-tV3giMBF3DN8Aop1B1D7pGp3HYPMQlcZ52JrOhxFrEE="; + sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index a241a10909..5052f0aef0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -23,6 +23,7 @@ let werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { version = "2.2.3"; format = "setuptools"; + pyproject = null; src = fetchPypi { pname = "Werkzeug"; inherit version; @@ -66,13 +67,13 @@ let (self: super: { octoprint-filecheck = self.buildPythonPackage rec { pname = "OctoPrint-FileCheck"; - version = "2021.2.23"; + version = "2024.3.27"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FileCheck"; rev = version; - sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; + sha256 = "sha256-2MK9whPpgwQC+WPbPf628Ocjz6t8HKozblP7dmjD7RQ="; }; doCheck = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix index 479fe1bcb0..8e5009d440 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix @@ -10,6 +10,7 @@ , elfutils , fetchFromGitHub , flac +, gitMinimal , gtk3 , glew , gtest @@ -48,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencpn"; - version = "5.8.4"; + version = "5.10.2"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "Release_${finalAttrs.version}"; - hash = "sha256-axRI3sssj2Q6IBfIeyvOa494b0EgKFP+lFL/QrGIybQ="; + hash = "sha256-VuMClQ5k1mTMF5yWstTi9YTF4tEN68acH5OPhjdzIwM="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -77,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus flac + gitMinimal ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ AppKit ] ++ [ @@ -118,7 +120,12 @@ stdenv.mkDerivation (finalAttrs: { lame ]; - cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; + cmakeFlags = [ + "-DOCPN_BUNDLE_DOCS=true" + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Override OpenCPN platform detection. + "-DOCPN_TARGET_TUPLE=unknown;unknown;${stdenv.hostPlatform.linuxArch}" + ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals (!stdenv.hostPlatform.isx86) [ "-DSQUISH_USE_SSE=0" diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 35777a0b25..08835ba6a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -1,6 +1,8 @@ { lib , stdenv +, copyDesktopItems , fetchFromGitHub +, makeDesktopItem , wrapQtAppsHook , pkg-config , qmake @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ="; }; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook copyDesktopItems ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PGSQL_INC=${lib.getDev postgresql}/include" "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" @@ -36,7 +38,22 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + desktopItems = [ + (makeDesktopItem { + name = "pgModeler"; + exec = "pgmodeler"; + icon = "pgmodeler"; + desktopName = "PgModeler"; + genericName = "PgModeler"; + comment = meta.description; + categories = [ "Development" ]; + startupWMClass = "pgmodeler"; + }) + ]; + + postInstall = '' + install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin for item in pgmodeler pgmodeler-{cli,se,ch} do diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 50dcd18d73..d790982b77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -17,6 +17,11 @@ let hash = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) ./meshboolean-const.patch + # Drop if this fix gets merged upstream + (fetchpatch { + url = "https://github.com/supermerill/SuperSlicer/commit/fa7c545efa5d1880cf24af32083094fc872d3692.patch"; + hash = "sha256-fh31qrqjQiRQL03pQl4KJAEtbKMwG8/nJroqIDOIePw="; + }) ]; versions = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix index 824f7b1356..4fd35bee7e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitLab , mkDerivation , cmake @@ -20,18 +21,19 @@ , qtwebengine , solid , taglib +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "tellico"; - version = "3.5.5"; + version = "4.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-0I4oDMLYWomAF+wpPeA1NQk4nnhUV1RT6IYKJdOUcas="; + hash = "sha256-5oP/uGUw1oYnrnOU83Pocr9YdwAU+DaUaGHg+6NzmRU="; }; nativeBuildInputs = [ @@ -39,6 +41,7 @@ mkDerivation rec { extra-cmake-modules kdoctools makeWrapper + wrapQtAppsHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index d7a7c4d9f7..4790d43364 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonApplication , fetchFromGitHub -, fetchpatch # python requirements , beautifulsoup4 , boto3 @@ -23,6 +22,8 @@ , pyarrow , pyshp , pypng +, msgpack +, brotli , python-dateutil , pyyaml , requests @@ -46,29 +47,15 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "3.0.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s="; + hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0="; }; - patches = [ - # Drop when next release is out - (fetchpatch { - name = "drop-support-for-python-37.patch"; - url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch"; - hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY="; - }) - (fetchpatch { - name = "update-tests-for-python-312.patch"; - url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch"; - hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E="; - }) - ]; - propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented @@ -86,6 +73,9 @@ buildPythonApplication rec { #mapbox-vector-tile pypng #pyconll + msgpack + brotli + #fecfile fonttools #sas7bdat #xport @@ -139,6 +129,7 @@ buildPythonApplication rec { # tests to disable because we don't have a package to load such files rm -f tests/load-conllu.vdj # no 'pyconll' rm -f tests/load-sav.vd # no 'savReaderWriter' + rm -f tests/load-fec.vdj # no 'fecfile' # tests use git to compare outputs to references git init -b "test-reference" diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/fix-go-version-error.patch b/third_party/nixpkgs/pkgs/applications/misc/writefreely/fix-go-version-error.patch deleted file mode 100644 index bfe7ba2dd5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/writefreely/fix-go-version-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/go.mod b/go.mod -index c49d701..601443d 100644 ---- a/go.mod -+++ b/go.mod -@@ -89,4 +89,6 @@ require ( - gopkg.in/yaml.v3 v3.0.1 // indirect - ) - --go 1.19 -+go 1.21 -+ -+toolchain go1.21.6 -diff --git a/go.sum b/go.sum -index a9256ea..28ad24f 100644 ---- a/go.sum -+++ b/go.sum -@@ -72,6 +72,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw - github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= - github.com/gorilla/csrf v1.7.2 h1:oTUjx0vyf2T+wkrx09Trsev1TE+/EbDAeHtSTbtC2eI= -@@ -106,9 +107,11 @@ github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVY - github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= - github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= - github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= - github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI= - github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g= - github.com/mailgun/mailgun-go v2.0.0+incompatible h1:0FoRHWwMUctnd8KIR3vtZbqdfjpIMxOZgcSa51s8F8o= diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix index 40d8b61603..95d4b1963e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix @@ -16,7 +16,12 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis="; }; - cargoHash = "sha256-dXq8O0jVpr0xxvLTrsLJbiyyOMXXtEz7OMINqDEfG4U="; + cargoHash = "sha256-B0yPTyZ+d+s0Mdgeb23IammuABpEYWvAksyP7d+MEig="; + + cargoPatches = [ + # fix build with rust 1.80+ + ./update-time-crate.patch + ]; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/update-time-crate.patch b/third_party/nixpkgs/pkgs/applications/misc/zine/update-time-crate.patch new file mode 100644 index 0000000000..739f36f1e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/update-time-crate.patch @@ -0,0 +1,189 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 30a7f9b1b5..dd3f0104cd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -103,7 +103,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -376,7 +376,7 @@ + checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" + dependencies = [ + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -394,6 +394,16 @@ + ] + + [[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++ "serde", ++] ++ ++[[package]] + name = "derive_more" + version = "0.99.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -445,7 +455,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1383,6 +1393,12 @@ + ] + + [[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ ++[[package]] + name = "num_cpus" + version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1441,7 +1457,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1623,7 +1639,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1659,6 +1675,12 @@ + ] + + [[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ ++[[package]] + name = "ppv-lite86" + version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -2090,22 +2112,22 @@ + + [[package]] + name = "serde" +-version = "1.0.166" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.166" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -2243,9 +2265,9 @@ + + [[package]] + name = "syn" +-version = "2.0.23" ++version = "2.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" ++checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" + dependencies = [ + "proc-macro2", + "quote", +@@ -2345,7 +2367,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -2361,11 +2383,14 @@ + + [[package]] + name = "time" +-version = "0.3.22" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa 1.0.8", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2373,16 +2398,17 @@ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2422,7 +2448,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 1ef2e9d153..11bf657d24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -70,9 +70,9 @@ let # source tree. extraAttrs = buildFun base; - githubPatch = { commit, hash, revert ? false }: fetchpatch { + githubPatch = { commit, hash, revert ? false, excludes ? [] }: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit hash revert; + inherit hash revert excludes; }; mkGnFlags = @@ -314,6 +314,23 @@ let ] ++ lib.optionals (chromiumVersionAtLeast "129") [ # Rebased variant of patch right above to build M129+ with our rust and our clang. ./patches/chromium-129-rust.patch + ] ++ lib.optionals (chromiumVersionAtLeast "130" && !ungoogled) [ + # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size + # and std::hardware_constructive_interference_size. + # So let's revert the change for now and hope that our rustc.llvmPackages and + # nixpkgs-stable catch up sooner than later. + # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4 + # https://chromium-review.googlesource.com/c/chromium/src/+/5767325 + # Note: We exclude the changes made to the partition_allocator (PA), as the revert + # would otherwise not apply because upstream reverted those changes to PA already + # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144 + # Note: ungoogled-chromium already reverts this as part of its patchset. + (githubPatch { + commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9"; + hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8="; + excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ]; + revert = true; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 484cc0e4f1..767e244a6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -58,6 +58,12 @@ let # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] hardeningDisable = [ "format" ]; + } // lib.optionalAttrs (chromiumVersionAtLeast "130") { + # At the time of writing, gn is at v2024-05-13 and has a backported patch. + # This patch appears to be already present in v2024-09-09 (from M130), which + # results in the patch not applying and thus failing the build. + # As a work around until gn is updated again, we filter specifically that patch out. + patches = lib.filter (e: lib.getName e != "LFS64.patch") oldAttrs.patches; }); recompressTarball = callPackage ./recompress-tarball.nix { inherit chromiumVersionAtLeast; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1dae6fdb4a..448a504324 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,37 +1,37 @@ { stable = { chromedriver = { - hash_darwin = "sha256-/0mBZCSNULvZSQ/irsQSgNPsuOSWiRRnJA/6ogHYeGk="; + hash_darwin = "sha256-YndBzhUNmn5tJdCqLmpUrs2WBXXpTxiKCNczWEz6DU4="; hash_darwin_aarch64 = - "sha256-JWcYFYaaXM2KN6oSu7wwxztYPbhql2XYZlvL2ymKgwI="; - hash_linux = "sha256-odFoTWjDa9ilyOrQ0T+0xxedRD7YOe/s7xdAyyku74w="; - version = "129.0.6668.91"; + "sha256-taG58kMgQUD40aGqnyx9O9e9m4qGsTWX57cjD3NeHm4="; + hash_linux = "sha256-raWGzhjqWdm5bRK+Z7Qga8QM9kQYSXxdL5N+wk1hlXI="; + version = "130.0.6723.58"; }; deps = { gn = { - hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; - rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; + hash = "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU="; + rev = "20806f79c6b4ba295274e3a589d85db41a02fdaa"; url = "https://gn.googlesource.com/gn"; - version = "2024-08-19"; + version = "2024-09-09"; }; }; - hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA="; - version = "129.0.6668.100"; + hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo="; + version = "130.0.6723.58"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; - rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; + hash = "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU="; + rev = "20806f79c6b4ba295274e3a589d85db41a02fdaa"; url = "https://gn.googlesource.com/gn"; - version = "2024-08-19"; + version = "2024-09-09"; }; ungoogled-patches = { - hash = "sha256-kvpLE6SbXFur5xi1C8Ukvm4OoU5YB8PQCJdiakhFSAM="; - rev = "129.0.6668.100-1"; + hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM="; + rev = "130.0.6723.58-1"; }; }; - hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA="; - version = "129.0.6668.100"; + hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo="; + version = "130.0.6723.58"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fe5dfae337..4a2464681b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0b6"; + version = "132.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e25bc2af3eead50c85ac7788071ce95c2e6833758b82a8f5ce5ccff75e18399c"; + sha256 = "2bf1ccf753ee0f63de4c99dce1947add6ae443a3a7c016edcc7c2c8db2483e90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0e2881eaceedf139d43671b24f5a97c95ec0e78afb6635767d058fecff2ee44c"; + sha256 = "7fc7eef2a27e86355628a32c341372a1c9029f25d5791e9f5a5e4a702f4efd0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5d7b05d76aa98a67fac2bb1e7ed3382e5a773ed699732b7ceb36bbdf2f7f42a6"; + sha256 = "fc5bf48ed17526b860c282070bfc7475516cf8cb3dcca1f5943c239b225254d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "240fa78947be010e9a25a9d7a7a05a5323a19805af42a0b3ff10fb716279e40c"; + sha256 = "6e600a4d224af329f98e8898207b97d568aec7086f3dbd3aebf64756818a7bb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "eea78ee53aafc91f04f2d517f52038e1c8c45cb3dc48cd291e0bbb7c7e71274c"; + sha256 = "d2f5adc71fe72f8d17fea11b6d9c0cb32fc787ea91320ecb63d9b47d774954f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fd27ce68a63e48b10c6ca1f54d5964a957a79052ea86eecc3e4ac56f41dc3dd1"; + sha256 = "cf7f020204382c7bdd5134aa436c77aa8c2d97a67cde6875560aced14ed6bc12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1d0895eaae18d8015b6d87918c09956d466e69332c7f6f7c135fc344f7c96de1"; + sha256 = "1dbbd2b1b36bdbeb93b4f2702b0567749903adb45161468287b4d0b267c1df5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fc66226a6bedaf0cbf197674fe1a22a375f0e3b4063c657c1e74247b5a21d387"; + sha256 = "dddb31bbdd0eb21551ec2f8223cf40d30ab4436b381f9cdaf6011afd85f7464b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1d76f516a6612f98e70ff4f6e139a8cc0e94c1b59741997c62c2e7d5110bfb78"; + sha256 = "aeb5cfe60baeecfea03c68d610b0296a76e3481d15c656413a16cb102042d50c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ea7eb2fd67e35c630609cc002cd7fdcfa2ca8f9fc8075306f176fa1a7e32ad81"; + sha256 = "723f991b7c27a6cfdf35e9eb21a36c5b16b3ff5f89d38c31f53dcd81ab03a194"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ee0b412c54a55c3c3a76addf78f417492117da4c60c09acc5c8833f13cc13197"; + sha256 = "1fc1a108d18a2c12413fbbeb4f5b4d3a07ae5ba7ab987087bcdea9cbe8477579"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8d87382885ca5eb0f7e7cb404b66773da755a61f23f7a5bd26e55f870a573a6e"; + sha256 = "0164347e61ec42124bcd92d9cdda3cafbeff1a1bfc90f471a7a466de8ef81074"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f9c9046cad1b9101bb6be189dddc0586ac6ca699ac17a6781e4f2514c231dc47"; + sha256 = "c6951037e07d9c97ab3490d486c1698222ba99e3e6e61bd8d5916172d0538ce0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b1b562134bda139e48ecae233328a4c46fa63985cf3f30aa1788e6c5107f1d0f"; + sha256 = "2ae7d27b0cd4066e9804fc499ded8d0493e6ef93a76a2e705c4208dbaa0748bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6ab5dbb55d44bf2bd881daf82b55ad3927aac541d847ea78832d44bb3edac17c"; + sha256 = "d9bffc7e6f9ab2ca00716d5df6cf552034d7c5d12922b71b34d2e8aae2bff994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d4b43431cb1b2c63edea0d1e7f547251397151f93337796169c7daf74dff92c2"; + sha256 = "792862fb4834aa7b6126400059dc86ab476066683f3197f428d734cdb15dda55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d0202d86602613fa49fbb1f5e747cdf08952ce398809832787553efef23c85e8"; + sha256 = "fb08cc0f8e783ec931a2714f362b46327e031ac172613e5cae26d40be3f2b44d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "961e353920d4f68ce18ed2a052b1cec3b68997511e2f587ae5a90f093d9d2d32"; + sha256 = "45cb5a2905fc963269c4c5cc815d4259afaf8d8025bcfe1a19f88e52f5c42ac5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bcebd528252103a6c35a13d9ba74ecedd21df421363e2a02527def78d195e229"; + sha256 = "e9e85f24c36ff6b7e2fb49965a7c4c6210b75f81c42487ad4c918ace9f41c5c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "88be7e9729108ecf6ce9df63e82fa00f448387c67ee022693034eb4e93100ff2"; + sha256 = "ff1b1fd800fbac9e27b3af66e0d9c350d42a70256d954b502663d1f482f8cf73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4f18dd9faca0c9e958c7a051a6087d604c3818f7f8812f03e0fde90b2a4b3020"; + sha256 = "70fc2d9c20712adeab3307f951e78d858d936feda102a30d272eff88866c6bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8571187956ebe889c68ffdf6bdf8cc2ad7ab3922bdda55b13c2d20319ccd9439"; + sha256 = "9bb160c8a19eff6a9b53b2c5bebd1bc10c37dbc3bd15257b1e6f6cf09b71824a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4a698b38b8fbcf2bd31eddde0516d3ded002a931bfec2f8c25f2aa12374705bb"; + sha256 = "702b2e7227e8ec775da12f293381e41a22623818a4af51040b71843c07aadf47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "69d4d15a2fe7ac61e88f9d9da7245892d41b233eb88f693b5333285512485e27"; + sha256 = "7c266f6fe02cd073a7811901d6d2d3f3ed86ddc552d4a06ffd179734235c012b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "010819207dd46a9fb08df54d1584d4592b03155ed47e328f833ed84c3b742e70"; + sha256 = "6d14f75b49a7fdac8b89283bc017191a1f8dc708223cc68641752d0f84e85835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ca36cbac24586894e4f3a5c91c23358657699170006cd341636b0e7df1ce5feb"; + sha256 = "18d32f6a1d582d9a4e8e427d0c6269eb744296ca21fb0bd609d4f0c0361c36fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0d18c2b0a21a1cb6965c3d468994fcf06f828554c76e9d3a369df46272b67276"; + sha256 = "55b77f39bbce79dfe835b1d15cc732b4079614251854db47cf6446726213ad7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3dcdafb0e434fdee06c1a8a90f173754125b60542629ef2903ede4111e412138"; + sha256 = "5a0cb2c3c93615045ad9cadac0922759958bafb0bf35cbd88155cc3b8a9eb66c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "60e9d139098f958d2081e585744fe439e9a21da8e42f440b5596f11a794585e0"; + sha256 = "db06ff41080c04833bf32323fb3602c727f097a05c88a48d69f901bf6be9d9ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5cb5b3310c9d83ef60edc981ecb9cac86a37a6aad342cfd4de5993c2a5e5890a"; + sha256 = "beaf66d72bd859d671647361e53ff47f4767b89521c477022387638b57693801"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "119d0c451b376a9b7ac07a8a66b22b1dd4e3224104da70e432b960693eac8b91"; + sha256 = "07a74c134fddad0bc3d9e248734df32be97ce099c81ae3e301288906cddf8623"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6d1e5478b6daba5f38706d762371c63660b91c287b24cd523b2f69f04c343d9d"; + sha256 = "2a4475d0e18b8817d605c76e153b97703ffdeb1c3ad887820ff16d3d41580ab8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "329b9bfe890bf3c26bd8fd1f5e505989d983c0fb8e47e84fe88cdab8b07dfd6b"; + sha256 = "e5c0d17e4e701d357601dc65bfdcd26bb805e10c28c9bd2ee252485cb12a175d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "54687eb45d0a991e137c2c1634f3502365d479c3ca673f9632d3186499624013"; + sha256 = "489b5823e83899733ad2f94f03205518f55ca8d0fc66799af06c966b48fc528c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "66eedf169feeaab1e9c7996df987ed6f0a3f0efaaf854ffa0f1cfa657b88809e"; + sha256 = "82d702031a08d80143317d816bd51a40e3affaa47d2fd30c46f05d56123c2f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0943d17fd1a304b392f03247205f8ac9921a6572ab1fbe951eca591534236304"; + sha256 = "86ce2d02d6e38ae4a36ce3543be3335508ca83ea8fce3a0340519ef6fb2d3b9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "fae0777a01c5b3d01abceebfdd347f6c6e5cf7fc2c7e955dcf282a83fa7c7a45"; + sha256 = "c934c385f2b1eb801c6fe5e3a07bb98516133d070124db48d55c00e578b2840c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "179fcd7a6e1d5d8061eee8dfc232e320f9f1f240bc9b720293acc55979e7dc12"; + sha256 = "aee8d3793cc460f138a2bd9c9415e4e10ccdd4d0babb2ca1f9e92999f32702f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ebd4b70176296f7833c17a62d91255ee002f72a6915a6e6b900c37a169c9af80"; + sha256 = "9cacc88b8b11e9716e927e0710a07d1d1e380a8a0b4c8c4889a57b8bd2b000ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a75fbcd8ba47d58cd97cef837b410bf6e75b44df5d8a079c4b268c60fb91898c"; + sha256 = "a3bc5062e804d651dd6d630f9b8cc30683b40f02821f08e8ace1f0bec276ca63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "55dc7502274b2d8b01e2bde554bc101cb5b370dadc816f225166790ca90f9985"; + sha256 = "660345a284c5f87176f6b11d3eb58c86ab793021ea0db084f408612812bb1210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "18f74efef4ecba385b66652a581abaf3e399286035a8b48d716f0716d8c5a1e9"; + sha256 = "20302195cd105b8ca8a925450a499997ebf9464ba8d0fe0067f92605f0d1ad6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "5fb6f9d4660095276690e510ab92e939855d1a70ff7fd8985f66b63340968022"; + sha256 = "fe47c61ee2f11d48d19bbe8402d0d8774ef874e777db84fec934f5224691d923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7b92150274387c1a58eef3141b0e8981579b0b9966fb7a381dcd88deaa47b5cb"; + sha256 = "b1d5cb3135a1ede6e77f613e746e06198c98542bcd652e31482426065d7cd43e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "831036e8c730e25fa4faf32101190b9cc17c621f53c3531898929a692d1cf404"; + sha256 = "e66f0200113dcc156301640da227e29f55dbbaf641f40ef0c261a7d4637fb640"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bbf9078736b5d89a7c9e252c341977ba5f5473959ff20e8a8c804250433bf1f2"; + sha256 = "d2a9db19180b7e25a30065cf463a1dca4597d9126ffbfaee4d439579a83fd66a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d80455c003e4bc930ad90cba0c1ac2c353f40ee62d46eea9ace9e04b1aa426d2"; + sha256 = "14c10fa0999330ade75cc7263de98af35b5f2e1717d7ab8ee7399ea2b7f50290"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d7cad9bcbaf604105ac3b5a40aa0edd249d3e68e023a96a7893670b8f88e943a"; + sha256 = "ee3ebba089bdabcbedba1f467dff81b7202c6d0dcaa606fc2969c978c1b3598b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f0132ac7c33619ca15babea69a13852c07e28212add00812ba992bbdbbfda484"; + sha256 = "747d5f79b521227b64a11766e86c0691e314ebbc33ae72a3033c125db475667f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "02c012807824b92296c94ec4770633e0b7b1aa1e4cca11fe390d77264a8f5836"; + sha256 = "d4f69a8199424828c31df016ee36b54f7d1eb0bb2226ba527826ef84ab5d626e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "493fc9938e2cf097ec2969aecc1b5cfcecccdfc99680eb4d53f35cc82d0ea674"; + sha256 = "8764267032aef6eb4353587c79e3d309581b8430c0fdbe221b55c3da0dc91e66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d1429390dea25b931143963f67594817a3a9c206ac51f2b29173306ef208b0cc"; + sha256 = "13e5b0a94146880224fc2a7287aaf82535fde1842d3da323fd515706d60e9502"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "021292b8028a6ae18a41176718058d436b8b5a1dda4d3c7e0e49e31ed556468d"; + sha256 = "ae47af49caa90b98d8e400c49f1a48c4abf0186c142d3cf6b9be4d87415950b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "457c961054f45be98ba0f6add85a712d95375b59505b04e4cb9e1154e9289909"; + sha256 = "f1b3ed5ee5271208e4bfe3c4a5a08a79e4e8f0a36b2b59d041de805381f293d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "91a4327d47a8f259e99204fd806699de7054b9244b0bb8146471dd3a63e2d076"; + sha256 = "bb9e9e2c6c9d7a7a4d4a97b1553df76283a973936cb5b728b48de1593bd7f03d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7b603a91f18b3f377cc34ad30f004a52dd7bde4dcc7f672f74bb562ef540c30b"; + sha256 = "b218e8b43eae13aca4c8f0756af5b1945a566eb414c40c412d7c451f32faf632"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3eb92c102cecdefeb4e73010f2cd6120d9390330fe746ea6ea7113ba54ae9518"; + sha256 = "d17b594fcdc6b7c31b89cecc2f5ce17ef8205589cf2d04b31faead6f05f35918"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "86d3432271bdbb33b9aa218d5a11909f6fb183cee62d71808b9c820a0616eab2"; + sha256 = "07125d837dfa9934df26f6a55ab210471b24407b22905b241652ebeac4600c17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "56a7a3e8ce7877f9e6d50eada51935b9c751780dc90c4e8cffb19940f17fccb7"; + sha256 = "4c3494d7751926a2ee7f04dc037193cd81a3f7886f074a23315e34bd6bb63943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b50355988b3d276643353cbee06ad05c7a4e1ca671eac9d8fe54bf787d62e0ae"; + sha256 = "3140355fe1abf44aeee01bf6ac46756580fac82a222b1443046b33af8ff16427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "aa8f7ad9f5c4aeae3ccadb86da303599df1fd459ad6aee0450fe6b6674b6cd44"; + sha256 = "7953ceaa9abe716a52b7f5831fe50fdb7f31507ea8fa64a6e834f08562807f73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "111eb6af1ac41984af10c5576b0f79d1747360c679fe4cca84915656f1b17b8c"; + sha256 = "570aa3350c57f763e2686784dfc0927f01e402442de11a47001d2b673e818848"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "43fbe5f3d22bf5a671c157dce6632b9f30cc9ed9cc22d7ffe1c7939329d0b1cf"; + sha256 = "562e69a74017ff55c0961b9e73d8d4b45f4aa10c684dacc7b3049d7f3609b1f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2f48806fb111cb14933453868fb485758ec4c9c68ccd37799767a3c21cab0eec"; + sha256 = "7982e8b10ce2003b95c037c02d8a068d0eea8627bb2c41880fe60f8c796736e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "da074cf7baadb63e1c9a3abbfb91ffec3a5803d4f7670eca6ac7480b183c9cf5"; + sha256 = "b9c8a73add36261e9a557fa88b8c7f4d8c2f8c6c109c1e953aaca1b0bb88ab1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "851c9436912128a0ae64aa7e1a9f990df503d69629c2ef4e926e0a6d8aeeb2b7"; + sha256 = "4e23ee1cce05d76b63ff3fe2013dda86159caf0bdbb9df0dc9fadd4b5b027523"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d542a9954f7021bc4720b6eccd42aac48115fd9efad927790daa49613f8f90b5"; + sha256 = "0c8b73bb4b93937ee720f83eaac9ef4b0830535ccc3291212196618b37d60edb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "dcc631be5ac05352bbc1168038a701be825f4ea003db86dc0b5f2e1b3c9791cf"; + sha256 = "84f219c7f0e59483f70ce45758b7a11687eaa1fc2e5359e66d01ccab2dc02ce8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "7b8f99d8cd68224937b5058524083d58934ce9122241d77cff61b1d33a8fc5c4"; + sha256 = "cf923abb277ac84d493b49e3e0e82741a306291b5ccb38ec7a904c9a5d6d495c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c36995dc2249eac5d7ca667315d09d9b59a5f2cf60ad95306217377e0c10921f"; + sha256 = "da9da781dee20e4b1ea5cc07473db80e64119a250e98ec36858f182c7c387ddf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ff5f11f855c84eba7852e786634b5025ffe41dc7eef3639123a441b2dde791b7"; + sha256 = "873ed71616863ff86bb5634e452efaed4c0ac876127e36274bf8f74417c37fae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e84813f0dafa0043a89497d865e80ebf11bf7217f8f911ecd94304e9df6b60e4"; + sha256 = "b33edf7736e12a74514f448caa3018c0c5b6eb6ee7c942049e3a6c8ea10968ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2cb87ce508563542960442774d8f7f830e70b22772176905234422bb3da3eda6"; + sha256 = "e9ed9d73bbdffc132e8af99d347f45e6172cacdceacde990c1acae09adfbc47f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6249dfcfc04b954adb3f189c78cc2a383f3ec40b404ac11956e10f12f4bf816d"; + sha256 = "21dea9ab323d83353cde05d982c16266e04a3d006338b81120408612d452d03a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7d57212324302b5d926be44567efe41a13676aed4f0f82072cf1cdb204919733"; + sha256 = "bb55efb232b0991ca144c9a8b9d1c627c2ee1d52af5f02c551e5f130d5c8db33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aec8f5e5749c4b72faedd53d339dbf6cbd6fa08e1ae840ddd4b78c4bc85efaab"; + sha256 = "8f98c37308f9a0e8187bd39a8f8ce2b95cdf560d66186ae593bd4f340334fd88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "10c50f4a9781dbcc9ea55b419bb7e152eafbb699d021052eea904260afa3263e"; + sha256 = "19e2225b259e7c924355f17427e6ec0fe44b3240ffe407d7e9afd058c4392bae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "c24b08ba6b2053194c1afeced698d9a0c82613ac0fe68e37d8121fe26f1f0a15"; + sha256 = "7403024526b6fac55a5fcb9b955ba263f7687905fc05c799ac7ba2238f61334b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "4e560df815dfb2f2f241b66c9fc0bfac35d17924b7039b2e583e604ce787d90f"; + sha256 = "a5c914708663bc93198bc5f02ff69c38276f330f8361ce05693d2e1b2eff4f44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "21e82b0c3789e570649704aa2045e6a1c18efec509bccad61479001fd4153e67"; + sha256 = "5a3fef5ec53b1a1df4945be65f276bfbc6581a8b75f7be59de5ff1f4466816b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ea0015c32dc1e563bbf551cdc2c68d80fd2201d0b6a692753f67fc0046f5a8cb"; + sha256 = "5910de36de93d6c882f0f09335cac6ea114552f0d71bf1a02c333d1c47ca8ca7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a7ffed45b58328a8b20f62fee06a1962335e2e33fae05d549f1f51d823ce8976"; + sha256 = "b3d3682fbe7a7bb3b3fd469ce02746522d170b82674f318b43271452e6f1f83b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "17e5c43d28de384c99db927cd81e1f3e0c2aa14bacbd912e53f82e8761dfb8b1"; + sha256 = "9561167751a7a92881f9e9b165e0e1868fa42f4a148cf87c4b0d83ae750b026d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c4fb6580921e5e10e726d264bb9aff52bfb42f4b262f16baafe5fa77cef14925"; + sha256 = "f63dd87205f973a5c195fed943e1a8117f80239f4bb4811a6ef45be136a43426"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "cd65f47a1809eaf8ebad9af6c4ae40f9f1cafa7fb37d5c59252c309870487594"; + sha256 = "15b0ca1537a31935ac1810db22b5b8796c21928bb1e8559726831727e1ae1509"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "553e14f9a6cc7a91e7ae4331a0c6224be0b3740f11ba139e1d1b47e783583e4f"; + sha256 = "03af525e5b94adad4f490bc47948655dce0284d2334e0d8d65b06fb329318bd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f751e253f51b2e4cf0816c5fcaaf89d0bcf3f5fa690f40668cafe0cd50c28c43"; + sha256 = "7f90b364b0f06e31922e3bd740bd326b17afd6e9a79b483ad52ef9ea0704892b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6e57f8f0fc31caf4227c7339460deacac7bbfd3f432c49a5f7b4b8edf71f55fa"; + sha256 = "a9c31aa43d793c1e07ace4c5a1896684174e329c9cc6c8812cca71a7e9b6c1b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "3d38fe4cf2b039af03b7e8be73cb35d529a0008a984ab4936afafd5c163a7a16"; + sha256 = "edbfcd159eed4e4925b159803e9832b7d9c455aff69a2be74fb64bf04f2a34a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7e5e5e2aa01985d6241f4327006c27651e76f7e1c3855c75656485667f38dc0c"; + sha256 = "46f12f7b489cab1870711e73528b5fc5275c77e3a6d9c1c5a9bd93b4b8d116fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a313c3be09fa343da4ab869785b0a9c04dbdea979398fa3697fccc4a1791bc20"; + sha256 = "dbf2a01daeb6c79902f77e17ecd120c57910cd4f9a72265ef6b5b98dd87b7f93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "de9433a353d8cd8ed95f88a207e267cda90d17699025dea658975b7f0971068c"; + sha256 = "490fe02bfb5a1c07d59a6e426a47b19f9757e5cae7d571c4ee44e5883759ad18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2dd35f8f097147aa9b4d7272054ed80ef644b3898a366385ee68862cfc9dd161"; + sha256 = "60c8f3e6ab1310899e71a05537b1fa58768835de80cc23b6f35bdf1ef639d0ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f245fe6a65cd50b97106a6e4cd1d0d0bde221523c3969beb64abadd9318adb73"; + sha256 = "71281fced8f188e9ae6ca062468c5394a1e48448962646a8c09e0227d284db01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fe0d0cd53fa7fb6586b7b76a11471b9402e636342c6a40cfd12b80ab80018eaf"; + sha256 = "9929c7799792edbb2646cf09f953ae9252fcda5eccffdeb156e35e166ea68a59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "af7ca43a3dad5edfb8c85f337fe1e5ca6bb9c444eab5241f85967d803132be38"; + sha256 = "f5ff3492dc8fe6f7afa85fcbdd92cf8ada3adac59b72e41ebd61d666dd00cc03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7c8c34619ef8b378fd55320667c9f342a80042164612038d53bf617a1c8bebb6"; + sha256 = "0701dbaddd0d9ec72680fc1104487f2635a518b6ae6fd14f2ab113ca62c8e733"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5a55235e42a4ee956697a158d40e8b1b6e1b9b327868be0f363ce470044261b3"; + sha256 = "337962a7518ac5d69c694aaff30b6d59e7597b298d60ae19a5cb14a3753d9426"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2dc26b6ceec6c45c818dee7cbc0e22ce5c1fcb1628407e573dd821a0e467345d"; + sha256 = "74fa5b76b72495eb864d78cb02c06fdf2fcf92f2e73d1baf01c1ca555ebd947f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b145ddc7150413a26649c46d0363de51b12fce1aa7051007345bb43388af0f3c"; + sha256 = "eab1a95b5d91bdbdec164c6732be726ecc017fda3b353d4ad622a70ec9f83619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5473f4aef3f6721ce8ab7bf1ae20988a4062f326fb3793abf10d4ff4430d50c2"; + sha256 = "e27e70b708c64b05b6ebdb68f38a95d3e06264c56fe3d749fb603473eeb12626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9c449a468edfb9e98c2b94fe0c6729317f0a2e7b9e2fc9ac6fe508f9dc9ba2e2"; + sha256 = "3976fe366481f3dce7a3f42fbd49925e7988de58a869d0d96bfe7c61cc27b4b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1da792e45fd577b7ea2e9d4defdbf45c2ce7b0a1577e89e5805489a14ffeb180"; + sha256 = "f8cd9cae21b27fea5bd04b6a54ee1152d729bc525a565fb97083039ee1244888"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f8a2c573dd5ac235cf1ad946b1f74fd373c0ba66ff3a1c9adc78dfae874cf2fc"; + sha256 = "189c4cf298bc5b3b21bf5ae0ee2b14d8a5bcf998fd79c27a943b6a146402c2dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4e72dd27baf3b17573f6a3d4e9a9c905679c398ffe4a54e9564b1bec9a1d2557"; + sha256 = "d125ed28dc6fd22bfbfd98654f0e2dba72fe54849191ebbb6cb315ee36b68e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3da409c0aefb795a566ee2e642d5c8e6a27ab5189d5e37a0c66716acbd63d0a8"; + sha256 = "1e9f50533c2da8db6e802b1941a2ceccf58cfb38be1b139a04ac559e0195e9b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9fcbddaf46354b670c28d12623ab6a4d6381475d2cf2ac4bfa6729d0d3880925"; + sha256 = "62cf1879e3d009224cb9170bab531a8972aa897ac4707f6b343ec1d1e946df6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bd4024a7c6df02a18bbe4295851fedb70d2704a1b5528ec45788fb1b40684b7a"; + sha256 = "c58bedfb24b1b0be407abdaba951d0d4da01213d28c16edd34a84518e25c9d0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4714ab9a89fcd76be3da2f9c338540c668fb3b40fc5dba28eb052ab7f93cedf6"; + sha256 = "a3a7aef57ea6292ebf8d571cfeae66b11904ce2f2da8e36d27ce0c37c5c76230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d2f00109179d42b53eb3f8efb18ff4e6c81c6035fb3e4d39f763d39cf5feeae4"; + sha256 = "5d8ee5fe352cc927d4afb25f961beb104e1ad9877935688c963abe9e0722878d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "250ede13a919bb9b144f3e89ddf188bb6319d220179e7e214fcc3481aced6262"; + sha256 = "148be65e21de5278a4cf1421b738f3565411a6a579814b44dc092dacf0c9535b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "442903bd530fc6d79e46b8e10230b9714a107a0daa504a28e824faf333f9e9aa"; + sha256 = "b98edc55987560c4a688b15a0a069a9a7b74d06f42fd0b2d508955ec34feb256"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f02ba733155aa236391bea00252fab451a9885eeb098883f3965bda2c229bf46"; + sha256 = "aa16a1285b84b6fef8e82fd080ee08e40a2b388f4a09fbbd7036ce0dafb554a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "67d96433b68a9ef9255be578c1191795d22c295ce76f2f9663460b2b9154f692"; + sha256 = "099175325b5179d10569a223bc6a35688199d0f768975fb96d6eda90be270e4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "37e5b6825a7a39b7e486c955ccf2d2428a4683c1831bd3ff49742b3c89161a93"; + sha256 = "d00fdac2c05496cc882afb6a8de72f7a3a72b03748893d246cd46582395cc294"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d423663fd8534f8d77dcc704019a95b252e42495df298827ebbd4512daada3cd"; + sha256 = "012d9ae56fac6fe05d4260bc3082b7756723eb1c391cce30823641efd5cf29b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "792a0b4140247309e8d0f49138e8c0409732f1105cfec6ff18f462f83f0b4b6b"; + sha256 = "99f7572cf452dee212a016bf401fdaff745ef788351a55e98962e25bd6e6f6e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b750be8197847fa5a1a5051a5a1d4d8ccb0edfbb3713810464207b459c83ddc4"; + sha256 = "e860e3d87d8973abdff51ed867b3d760a7b6308c6c0f83b117200217617e076e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "14f198e8003cea2a3acb4bf51d724f87dc0524e58152ce1c5f1be70ac456e73c"; + sha256 = "277685c88c1d7a07a70b09c91254b788bd2c5faf9ae1880b91e9245535c46644"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "bf37f4a9e58d4f9f221cdd3d1d2b8b6f89793f058a5561b02df2a3d0d0295906"; + sha256 = "dda987d22ccd29156a66bfc72b156213f033d73e066fbb7b0f8c19d1d4ed7e93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0b17f45941135765ab3dbf4c5eb75f8f76ef006ec6f80f95a410bb54ba83d9c7"; + sha256 = "826de1a5bfd119b8531ca985767626ac8f2f485e71a597b4d0ba847fe335d6a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "781f06b8cf136114639c5f7d39be8033ab0dcf700a8bda59e58337b17e5a7667"; + sha256 = "9899a41d404f19bede698ac516f4c3a43fa0b5117952c57696ff4908ede3eb5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "13fb05fa4115d97d44e401350232c8856f89947a771aed3def2a2105e246d1ea"; + sha256 = "468a23fcb99b47e6fc6080fb8fbaf252f33d193a029f78f084522cf3a32de594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fecc32f4a98c31f7f6ae032f55c3ef1649b041245d7c49c1d1f5462047b9e671"; + sha256 = "594340e9073e059d56d659adc54a19722d563f3e63774a46cc5c3d1a194c75ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "bc97613b91bda81c2ed9ef92e4e444f5dfe2c16c9a163bed189c1110cd54abae"; + sha256 = "4d1dc94a96f133092055fe621b839516d8f54c02ed6b47107b0459d8412fa3eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6fd69d37c09596fd74c5650ece23a4661cb0870b80d70408100475702ad6e907"; + sha256 = "ffa00c617bd97ec8ecd11167084afa986eff02c1d45501e89f0a44364196acdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "13241efce96508e23c858a64fec98c2445d5aebf9944fc320b8b06dbdb8fd731"; + sha256 = "9749a159e16630fcf885adb5ae54bd12a0cf03f4b628eded68636ce85690fecb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c3ac01537dd38d6c66519d0c97e38fc1a2fca07bf664ee5f5d2195bd39188335"; + sha256 = "703bf9158f3591f4b64899e1720dc62a8b007f4c1dd3d7c79f45ddfde696ee21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "420e42a239f73f37ca3ea30b230c4bfcd554c0581d7ddf44dca80fcbca6f0750"; + sha256 = "47be86544f11e1e6eb21b611e7f8517d0b7bdab6d2d36fe082c47a6e933468b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "73b0f24cd5eb814084982544e5539ee612b4b37ce1e1bf7fafaf22c169e9b5e2"; + sha256 = "362f3e884232c66d071747c3c024befafa04dc8e692540a1ea7c652145a7bce9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b97b8097536f728e7a30dec8d39676ba4a0496f880f9c918cebe38a782ffafbe"; + sha256 = "1c464e95bfcb23a36200d36869efb17c13af2024f4eaf6b698eec3659490579b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "53382143432869d6db33003c43610325bd6dd0bbd7ba9a508d1356d10fe3169d"; + sha256 = "caedb1c032b56a89f96429d1f4be58abf9b70dfa0f1eb18aa2a9e3ae8d04cbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3c8667c07918a0bdcea9c44e847cadbc1e06defaa43465dc6fc3158bfa8de9e8"; + sha256 = "a7c1427c61d676b4984bd6cf946125f7ea9f95150a0e44214a014c2a40e84925"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d0f63ba4c199e15b8849d40379095db58f9fe2a0ff33133cb1b5244cd991162c"; + sha256 = "2aeceb6dc9b404a95dc11a36975ac8cd2d79e4ee8bdb67299a84fe102b436f74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e4741fe190ad923d6b24ad2a9bf81fe6c7d924fe1b3bfe09657fd5ff6d7ac962"; + sha256 = "fb6ff671b9ad5c188e44e817d7c52407ce53f21a589b3c4a2bebe2e3a5cfc2d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "62cb5d82d0308ed53346c359d61a5f90b48c50eefd6b6714cbf1a8e18c125f52"; + sha256 = "c17b7a357e2fc51b826317201c3d8e8dc7625db213e5c67baa80a4c9528d1b76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8594efd78d16d09c7890d9bef7b121529564308f1341abe27db5b35a4e7d3ede"; + sha256 = "de91b909c0eb79f0997c6ec6a5b9c44f0bb029ca0b10dd347ce3119bea20540b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "2a116470fac9ac157854a63b30515b991eebccc0ca3f3fe74f56be11953d4e2c"; + sha256 = "d73b50eb034ca034a2059b5e5d998c4e0358f8eaab3a7ace0f8242d3a3824493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ddf0b9ef209964345cd9cdbaae621cc1f85dc5fef11143878f2bc285155e031b"; + sha256 = "b75dec3610e738b172202c689b7bdf11e3e71761caa765f89559679472fb91f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2202504c37efeeb7311baa9841dbf49b50040fb6952fa7b4fa24d925d765f045"; + sha256 = "fa95c04156d2763f213018dce25f0dafe226a1fb11a9c7b238e206f0169f6747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cc09d2ecbe1eb69fedd6a76e5163a6958a4d6103a8fd496f86cc2b9f20367431"; + sha256 = "41d7f8a03bd0d93fc8372a2688d7b797cdbb0147815a5923b0e420a65d1863f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7e394917b96e393b83f5b1f9fe86ab1d3ecfa9c98dcfa1762c7f86c252911381"; + sha256 = "6662d829a07d6c327c954f86b7c174398d39061e10336f217a805df4680c2b62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ad4580e388ce2303ac54151d65913fd837259f428424c351871936f6453f043f"; + sha256 = "6a382d9f1aa39061b7ca1977a907791a044b9e4adb7d0058bd6602b450168348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f0c5a2c03a58bc6c3489d7e77413052e2d3f5946ca9de0cb9447675ba9ef2b0e"; + sha256 = "546e832b5578beb46cbb53fad43fb15abede650370edd122952e8652fb5042f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c552bf9168c406be1b3d98f2db782fce7ab38dadb5421cbe1d3655da3e746e10"; + sha256 = "a74e231ae7f554278b74a59e58d56beb5f4cd6d9d6aec30f27c2a47f42868237"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d6cb09990428c58e1cfcdf96ea578b82acd8d811b1b422bc52a064bb4d764772"; + sha256 = "cdadb68af57477315bee3015115fa550ae1f3479a5b067987f67a0d6ab7cbc10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9494c3fd3c1fb82aa728ae2b5168a24419539559876a8e4133fe25084e145808"; + sha256 = "725af00249d030946d635f0c5841e947f574bacd8cd63cc51b41970424f46d65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8f6de4c0aa9e0954501f1aaa9c536442f858c725e53a960630d41a4e69632388"; + sha256 = "64ecb93a0d0869279b6d048f84907ed8cc97fc3460444835cfe6241ff6d4499d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "eeab0f343c631ae4ce59c72f420ba405227262c8e4a3c310d155cf72d21b6623"; + sha256 = "93d0c1b9d29c9c1f2538b9ea6f7138f9155432fef3963fe2f0a888947a956415"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4bb6cd84a5762dbf1916314afd7379b0fbd61fe432a333a33843a54c7a37c43d"; + sha256 = "4f126a761ecb8cf90b159085afb90752f516a0fa17018364b3bd74246c13c748"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a1616aeb135b63aecded8290397ced2b9ea72a801ad8f498dbb2f59590cb6105"; + sha256 = "36d7b19594b12622aed7a246b4478fdeae82edc387bd61c613f969e09a9c9448"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8553daf4ad1471462c14ff7c1186e57f6ddae5170f9254c68ab89903edbbf14b"; + sha256 = "377f87e02358e496f3f8652f7343b4d5a2b41b2a0a62a2cb4150bb87eecd2605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "353cbe93c7c55ce8d59784b12ce96c904802bcbb9bbf6d8c68ef57d7f635179a"; + sha256 = "42b9973e2453635f609d08f2fa61d4201db1d0ed220d536f7b07ecd62a8e89ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0b7778b4ecc966cd3e010996e250434350d1899be0657df6ee759780f80f1fce"; + sha256 = "a2a3615fe3ff217e01b0624081c2c4a331977b5bd827762db42d5dc7aa29473b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d7906877c1ce9c6ef47de911b870e067d27b5c83b52771ae7c6052fb437caba7"; + sha256 = "85b5013dc94f8fddd96c65d33cf358e00be0af5edc3ca7e2f5488c18f0306203"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "23fa3ec7f1a472563a5b98943dbc576e24020480a6f5e6d862125e2c496c6f72"; + sha256 = "f93a665c7e6ca686aec843e4d2c25e88adfe44acd549923b0423851ca727203a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ba938b86472dc92704a2791c33aae2386d3a56ba0e027ec0828238752e29823"; + sha256 = "1d614936fd91b53718a8f538bbc3728245f2ca57cfb59b476468a9181ffd5868"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9ddaceda06c199fffab52fcf1e04dc7a509d68dd27434fb5ea23cc521ddfd6d6"; + sha256 = "894752608f06b01a105c480e6a884a08eb8d5519d5d4eb95c906aeb76bf3aa39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "29797113978960543d6204be64d1f388acc270b6048416d8ef7bf1247ca9f4d6"; + sha256 = "91ee3ed34cf51fe0f21533ce85c9df8af6a811a2128b27897869a8b166ecd7be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ae7b2f0d4502bbf38afa3011e7c068cf163ef49778b16c219ce43b0b65475b59"; + sha256 = "a9dcc8548d786319bb0158ac8002b9afbfaeeafbbd0f727ef481d3769e11745f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3e63fc3c854a7c52c6d4710e5d5ba34cd3aa74d88c640c425656522dd1f1ed33"; + sha256 = "261dd39b2d29f35b517fea14ca1c1859166a9ab9350b051e61b0f87b6471f8e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "afbf87dce72ea5deecf254b5c3ea2a76d683bc10df9490c0b5d9cb093f1d744a"; + sha256 = "c3d034674c804e21e05fd3a928f237fc311bd29c741f1762e59e8f335de7587d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4713af9649c2327827c95d67a6b1d9bf7586109047572a585f605e0abf126aba"; + sha256 = "5d4cd4689ffc4679eb6bdea0209aeb6cc74ab246e6345abe361b31a09f76a758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bb30dbfc7ca1dcf5aa6e7e087e26114fa99b756af2814859ac40f8622a7fd8f2"; + sha256 = "4824f4f413713c4b80749c6218cc524be59fac57b96100229f9dd643f6dc6420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "2efb34ec434a8e761b8af548cb08d1daec95dbcee7b18febbd4574f44991e2d9"; + sha256 = "2f64c8d6bb0ae6bedc35b9a6da0757708cf3588c43b74cfb699e7d066061d754"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "4854311c9c6097b851fd48208ebd2e3bf8d9edd5176cd8d59d7f6aafb1a58f3b"; + sha256 = "0e313fbf71be605309305e7e1417d1a5dffcb90db71448f6ae9796cd4481bb23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5baf7f6d41688e67d39d8fe58b418622ed45847b8bdec140b208835de92b192d"; + sha256 = "d88900829c3c56965f487d191c59880b4d8db1c2158c2a42345c8488ce9e756b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c537f45f4d3312fd84820781876f7057f15b729a2acc41cc9cb944b349a8ab77"; + sha256 = "68bb81e1d0f7b28349c21b9f3ef1767c0a16f6867c25c4eb9fab92e83bb009f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b3efe2b45e40c8c19c71a391bd56d8217ecebb306e248d1bd605b9453e595d0d"; + sha256 = "907b2800d6c0f9d6c42afc1d39012bf08f91475225a87bf34ab399468d415430"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9e1834577beee58f4154a31490de01af4841f589b1c99f1bd988a3997cfaf158"; + sha256 = "922f321fd5d07207b96dd7f5aa2589b9ec2f0e15a7279722a5f3955333fa9618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "242e6cbee2e452771c96196e777c3f3e6ea3b23d0bcf7400f9902ce9d414452a"; + sha256 = "0366df618f6f90ba6e31f6d6765105eea4fe0a659ee7b9aba620556488dfb5d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "578f1a856c800849ff763a78a14d86916f5a5a22b02971476b5117bd3a30fc67"; + sha256 = "2497ba133e392efa3fdc87d7b57001161265486101fb50b516335a9c4929cd2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "d1136d8e646d7cfa6ea711a879182591d00f7e378abde95889aa0429fca2778f"; + sha256 = "c31950477111b72db49542f6f4d9a29a2642c62dd6e34b3c8673b4598aac3fa3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8fba9a351dc1f2133fc3816ff13e2d479044a256e1ef0d61ab5df538591fef40"; + sha256 = "bccfcb28c3041d9a729130655b60db18ca5c095e969b3f7e534a81aa512be095"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f24a14ee3bff011451c826e1871d811a4c9411f3766202037d1f8fcba7ffc9f5"; + sha256 = "62eb9a87d538acff99abd4fc48c67c82301e28d31cd22570f686e027889f2157"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6348659cce711a9165fb446d4415f04ba5d46a3e4dc27ee0525563ac69e50911"; + sha256 = "eb2f241dfc048de3dcc3f0c78644c9a7fff3204a80328e6ff4c8ffcd5c1b8fc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d1be462007667a55c921ffa8398e5438d5c0733fb922af38908af65ca5607518"; + sha256 = "6d1cbbc5156669f6a8b2c716667c180093709bf2c9b719b10b367e1a35053a5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cb2a394f10be16b13510a6966d6566d0bb0f2b484998158f4988de5881238ef6"; + sha256 = "5d2bdfc8684cb85b738ea2cb12a5e37f111989724a64519c372d2d4c84b05ebe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "098fd826d39afb9775c2750df009bce9559f87650321b8c065f4a476f11ca42b"; + sha256 = "9aa8fa19894cce2203f703f519652e60efd643bce8e3d9e9dce4f44d4af3df90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9b6a8f7f3a5ddc798b86104c313b9551ee58e457a13c51a4e7df6d0633d2e8ba"; + sha256 = "3edbbbce178af3b9e5583eb9b57e1c946fcfa844a9675da2dc69dca98b51c959"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "c2ed020a41c8910fb26070268e467cfaab7669641111b377cad8045f3aa58900"; + sha256 = "72182590b349bc1460aed8fcd262e755b8dda7b4f789af9bbf65ba3b9e0e4b21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "4a23815d4e31200e862b4c6aa88782963f042639df71064d1c8304a4175edc48"; + sha256 = "03b1675157ba9becd866825e58abb58831171f12cd724fc222285e758f093c61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2fd5d51abc2060c99611ce87e3c701fa34553c18682907f16edd132ec343b89f"; + sha256 = "0fd528ce2d1f4b7f87f225fa76ca29b32500a5d66d61858c238bb89a26784cf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5f5ffef49964f0f2d2d84b5c8a76489b9d41c6d6016005b83801888d091e3459"; + sha256 = "68b492fc89fa8b33a1db3e514feeaaa6083290b47bb6b0a6b2d24018a9dfa8f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5478466d9f5561ffb7c0a9cc7da1eb38380fc72a59490582c5bca9825e00dfb6"; + sha256 = "c0b5c0f615220d7e746bc0a3236233430086cc120efbd1a8afca433ad1cbc63d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "6bef1c97ec3f1ceb9b8bc53acd208af905c8c3b7d7178404097d56c98ba76d77"; + sha256 = "b3cf7e8ef07ba0d69712ad8942d4939e0242dee69602a84989b3837a3e212446"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4be7246171e5341c348f22b2f787e470c77435353874097b59848893ad30b609"; + sha256 = "0ebf301475b58549e3e9e696adf1508c39132236d26a1ac8eba9227de45347db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eb88c2d2abbcbf2f4b2ca3eddcc5b6e04de8ec62f0d7eca429f355c9945d2d35"; + sha256 = "4fcda91a507b2067e76b6ea5a3e923c6cb0d62ec8d31c657b0503a85b907cac0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c925a98210ed9f4195fea56fbc191c5ef7b87e7306c57538c087f92c331a4765"; + sha256 = "3888236e063a6a724f751275ad714fd96d65b18cd1ace8242a7577c0ecd27f42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0eeb92fd2d5c0dba6f770a013bcefa89f09c1984d739d356dd6acaf8a487cf4f"; + sha256 = "35ee32850af101c1e762e3a04ae17a6c2f33c58bd0aef0fcfcce151a6f34bbe2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "749158144a92a34b4f21e97c339bff01560e7ce346483ee6fe8c07c1b42cf10a"; + sha256 = "0c7c5bb2edbb8f0ff72eccf07c01ac078e1d9b92da8ea6789a2c8abe4e78e93b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5d8b034cacf4629b85d977d8cd858dece48055c9f7e7f3c3fdd995bb0cc619d5"; + sha256 = "2924c50d23472134428b699bcb4fc3714a90ff54820fd58fbd46ea55fbefde79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3b3708ba6ad65cd0e3bdbe76cb6976a6782376370c4da3ad94c7817bb82b91df"; + sha256 = "454b7dc139d407e95b94d4fc5fcb0d298501dddfd6d8d78416668e4d3e606eb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "858e451b92da437a93a89b3d512437177b90ca118f9c1bdd84948d3ae1063b71"; + sha256 = "e0bc922e34eeedc64e11da87308982a79645d0df10f9bbabbe5ae256123d8b57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "56708c84f1784a85e27967b3eed74774730d9673ba4235376328dc09602ae007"; + sha256 = "475559c6e4c119f9aecfa92d44323d22e986704565bdc6e929536a025ab026fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "12f1e435827663e7e855db5fca9f829e0b9ba21ef1a7c3dda343900feaae0350"; + sha256 = "c6c0a5073220c1b93a869ff5abdef09fb87b234842c13940c233e3ae73233057"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "815df93bb5d9bfb1c96a902e02b860f239705426c57a30fb23e87a2c991f4f92"; + sha256 = "c328c8f053ed31da91384eedd0f7f8d16fa182adf15ed92941b0cfeceb7b610e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "dde6d679e2e8281ded4ce724e48ab9173a1ced0989e0cba579a29a92a0d93f01"; + sha256 = "40509f9119928a59d273e34c2e090f916ca8ce48cd0c07d49305235487b924ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "04d725359e36da7f8cedd8aec85f5ce153c36d4c0065caa8ea26998369df5434"; + sha256 = "b7521924ade0a2e62ebc0a3d22b84f69dcfb9c217d65ce289de800bd258c8c0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6775475a9b4e504677cf37e63d2fffd120793892e394eb810716e55f8cb01b09"; + sha256 = "f15d5c4a631aa0b76fa43790105caa5cf7fcbcc501dcd11e7160b9ac4d68519a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "cd35d192d1a3c87d7398cbb82b916f87ab333518b9926edc0ade07fe2e37d2e4"; + sha256 = "a429006b7f8112425e959f26ec1d80a0e9583b33fde9201eb7ac34af108d4a6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "298d1cc89d3fb4bc5f351551a1117e3316f89aa3ef12b92ccd55bcc11d5aeb72"; + sha256 = "73371c4d0d2a90e9e7eb7fb6a8b678ae5403babc04b48c783dc755d22aa2692f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "bafe1dd38b2bc88cf6100aa4fcb96e174271bc5599468e3519ef79d1d0b0c5d3"; + sha256 = "d6b483d269de8b29c8531a2180203765b06d8327bf4fc03a1b4f1388e6e090bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "9fcdb11645deb89d7e9c13b2a10337005ab972263e4634c7ec0e9c16caebed5e"; + sha256 = "a3356b334119bcb5510ae065def9639dc5edc70691e6418f4bb54dbd14f369ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "aa896e7433b6be800b3ae0c7b9093b5e5dd45ee75d93b5401ebabeaf2284d194"; + sha256 = "76efdf2ece93286022cbeed82d2a0ea871c000c43175c7e2b1f4ea2d424ac72c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5dbccf5b5ca17430f8dffb80fdbf572f66d916e86a91be335484da5e2e9e66c5"; + sha256 = "bc3db9fd0958bf3497c3955ece9c82972429112a6f497dfa6587bf0d33c7e0ed"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 46da04102b..45ad155ce3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0b6"; + version = "132.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5a1691bb3359b1a2b8b80cc7653f1c236a29878c90ac16910a7eefabeb597267"; + sha256 = "1f39caa65b32ee1cc42747e1fdd6e0bfdc7a306c5ab4e067d6170522eda281d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9a05fac63ce6ec8b03a37fda416cf06d803eb7db208c8d17fbbfaca1bab37c87"; + sha256 = "87720c01424b68f0c1c6f200c4550fb8ee7aea8fec8f3bc54f1dea9d97d9a443"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d34fd5349dc517a4cf049760a8b33ca899aa7c2d12895f1321481b9974fd32a9"; + sha256 = "210408dd6c738553ed32f1bda08b7ebc2534358905d4c5900af24f81b73fea02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ac4a95f2c86ff79921a1a2dc6da9253152c7d12e15fcf63af3963045a364c82e"; + sha256 = "072f4f032af9998c6b495c9517c6b008188be71171db4a4610a99e28a64ff212"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "362cd6a3842cc8b345ed3abf5bfe62f6d1c5391831a5d8f957285d9df6c9df87"; + sha256 = "5918a67ff82170cd46dc384eb6558f096fe269111997fcf0815a057943e2b84c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b4e15b48981aa2c506cba07b34ffdeed74667909577ce5e856c347bea4544ace"; + sha256 = "9ec5f80f4a2f779e6cac79c51664afd8f8fd52615fe0f275108955c43869e76b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1bf2b7b8fb2bc69ccb74cfb5bc95b5ecb34575bfcf0eb5e0f33cd8ee08150966"; + sha256 = "841e1b0e7d8b57fe4652df1dd6df75bdd92e08facdee5dac3d19018086541257"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "09d6aff0101b8236e8c1c2377235e49756c66c8dfa0c30ba68e18f669c57087d"; + sha256 = "d188f99f3cc7d434f83b4f6c2cc061ce5ccce34e5d0f5417ff598f818402e3c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "828e196c1fc32469cf8133d497f106e45fcd1192c30e7572a2cc0a8c00d54d91"; + sha256 = "88aad5c943bdf59f84231b3cdef43ed58cd7bf4657e4cac4d7e17ea826277709"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e2e50c4f9128d98bf225c881d675d683ac835ee0592dae6037885377ea461784"; + sha256 = "1165d36af18c63adbebd849f8f7e5f60904eb4a12720a64294dfc7ed8ae949f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3869620429f625c3b4f4434577e3baefb0b8ba4e32beac233d62ed81cfe26d7"; + sha256 = "d76e76da3c393a98189cb91d03e946a0a75b47d9a071e645321d2cd003dc6dd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "13c48a8410c63d62716df42ec220f99eec130601cf571206e88c676b9e8a8b1c"; + sha256 = "1bf2fbffa615caaf148413ddab98ba33bcfcbdc1c4977a79e74bea306c48ce8c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6c8760d78d10422fa00999dc63aeb72d53e8a7bb240413e0de41a40e5530bd36"; + sha256 = "6f88889713b16a5efaf5c4cab1f4c18d44f847939d535115e5532f52af04d130"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6b0a1d1aaea22dd14417e1770bad90357c08eeb9806239cf2c86a04f03583627"; + sha256 = "193548816c4d771513e85aa5922d19b17b9b11409f5f2e619802f57992bbbf5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f615ad4ff6f850f70c472c4f4e4ae5318a8cf59b35b2bab570984259b733e337"; + sha256 = "d4174d7cfb015cd4d50efe60abfab4d94311f1c063f28b4791a483c07933ca10"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "02afaf8b5c7afc3285dc839ec707ced38aaeab837fc6a9915588fb13a080c754"; + sha256 = "ffc4d3f186e40e0cabc1950e60c61500491838d26a17dbc254c264112f77b69c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7b33411be89aab6e70a99194e6fdd5c065622a0b979e444c8ae75bcc226e6d09"; + sha256 = "d2fa4c6f2ece1ca73a9b8dec8d3fe8b5bdfe9e43a57390a20114b2af24ac1729"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5d5be57ecc4034752dca028b6efc1c2a3dbed34f484dab70b7a27ee19831e840"; + sha256 = "fc6ae3275ab21a0903d958b31df8ccb016f109ebad3ab4856d43dd9cf4a5295e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bfbfba6bd01ec42bdcf2766fe8f3742fcb71122eba6eddf8509a3348221072b7"; + sha256 = "5fac9d445c67e19aad732f3e8ee65bbfab452b40585bf3df04a7448914cac59d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2ef74d15c9b0d324daf6d10cd3af1f06b05cc9553ce1d5bd54affe5243422bfa"; + sha256 = "b11a214087f8c73a973c88241616f3eb4e1eec1276476dd2b8a7d3677a386b5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c893b17e245970ef90b0ed94652c20592f0646c310c29e5dd20e1ea54f4ffde9"; + sha256 = "564f4a4d8fba9aa26e36ee8a9d01f1dd8ccbfbd4af4e1f465704a70f44ea65c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d5f58729e0ea01086fb4c6f2de537a1fe6b7c02fba85ddea7418a58cacf837fa"; + sha256 = "ce6c0c613868cfabf505edee1b7fd6835e1d8aedbafbbe0e4628ca74679db7ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "62b4f75cec409b2afb909009c4b278f8d18b2c467735a95d4cd983dde4b0d9b4"; + sha256 = "ad1415d623d08acf32a6a891f4c161a576eda25fca64443ac84b366769b4fec1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2226b0a6742757c08420bd2225abec0840e1f68e590bd0fee593c493b4010119"; + sha256 = "9ba1d43f5899c4eaf9c01da2032cf77bf21918d93c6cd9e89721a84ec20c497d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b2b73bd3763707f267009511716d5903b9e91714c680743b51d3b9ea3b9c21bf"; + sha256 = "0c1ecef4dd5c824e766c715f9112b7f848341193dbb26548459ea9816878c6bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "620027fbdf95cc3dad730a8c1a23ca0edfa9d189ef2b46a1c0ddc219d066a2aa"; + sha256 = "70f07e829e31228793a36cdd71324b8d1e4e7a6da9830338c6d2520af2fe1864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ec7380befe2f9f210eda51e39eb1c35fb20bc80f791b9a2a3b972b1668f9dae0"; + sha256 = "65b78e48e9aa307e8e9d77640ad1a3332393ceec40422bd7da104200deea61ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "4b978cc773072a4fc16908aa586a234d6294c4300e4d73d43e7af1497547514b"; + sha256 = "3a42bfb73b33f0eb5a05b166dfa4032d34c4ac0a7470d85bff6c3a02474d702f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5945594d5755d912ac26967ebe74edd84ddc3ed986148fb725875ec20cab03cf"; + sha256 = "5c11d5679515a2c459ef9e2092cb1a7272a2592f61e082c9da2b856bc6455392"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "71776da8c5fda5e104cafebbaf6a5b57dee1fb8b3908005592e06b71564c8aca"; + sha256 = "e5dd46e8f7acadb4b2167b9f123bf8415d97943ccbf837ba62b0ecc19775df62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7b1096903c176f9cca74b27437bb87ad6d479d7e494553f14aa8d3dad724f853"; + sha256 = "732a5a1d28e388393109ca1395f5ac0214a51d736f778e769b6f1c81b63ea800"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "dbe22722065c1f7a13b003290c6de00f69835966a8cf51b3cbb4effad8aab3d0"; + sha256 = "b3cbf42d087663b1c9f81eb42b1ddc649995fe212208e752d6c346638693392d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4235fe2e940396efa7fc28e74065e9fe11295e94329c096de1976020bee8d75a"; + sha256 = "06f02bbbc6f3799c7473a2113076f949704ec30025235d76416cd228b18dd4bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f5742e76561ef0046dd92f83f4459d8064798221513fe546603a50246ef06a23"; + sha256 = "09d3fd010b55e7732624beacd56b5bb5bb4b7b7cbcaf99078b31477e0c042edb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "03daa72497607f4dc8f2b30bd0050ea5703bdd75832c540ccda17946f84ac6da"; + sha256 = "da4fda907872e126ead94f96b1dd57f106855eb7ad394a265ffeeaabe04dfc2f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0fee04713d82b4b848f7a39c92fc1919de493c628abfd0f72159f0158ba96280"; + sha256 = "0794e5be4c6e3b12f0a60d90faeee861093f46030fced53dedd1c0edb1ccc28b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "97ac58075af93d2fc12834d3a8de21f6fae27e9249bae42cccd62d1f753bed30"; + sha256 = "f0590e9a1f22b8b801c9f302f2c02bea6214ab679300eb3961b4f965c8db55b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "abd1fd086fd93c51dc1786b052d5262c9adaf66c1d8f12efa02a72955aaadae7"; + sha256 = "dfd233907dc1d4a67a9e6b93183b570f759adfee4903f1b44d010dd0a689afef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b013a59b70a05b32eece94ff92416a25bea022823a0b44ee6cc49a9d7131ec8b"; + sha256 = "6934b32cafd86716039827eacf5509f7d3a59657ade55fa342684c197b95fd0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "10c1e93056e3ca2799389615c556632277638abb897fad39c257d2ade8ba8b59"; + sha256 = "f04e6d704828a86227a81e5e830570ace80ef1534a646e90c89aab068ad8fa45"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "36b2c08eec456f1d80523fd6d64639d0e9a7db80d9cc324ed7c7af738ece3dbc"; + sha256 = "98976288478afbad1df8f9b230e6008b07e93e5c895cf78f3e5d95919998b123"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "159d9e8c6871c78c136da9c7039c2c206c41c729ca837284b35d012d632446d5"; + sha256 = "8863e64f00c277ab35e04d364e784f844ee4bf524ebbafa472e70b16aca123b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "397695812c21d165d9bfc2a272431484b31597f863cb4ed0fee8c74ccaa6e1fb"; + sha256 = "97fbade4177031acaa3f2db7f3674aba5a4c523872606295e2b178242460cdad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7a52bb6b979508d48223a61d09152c59d29b183164706f9aebd05edeb1958961"; + sha256 = "5cd45fc25e4c9f6dfb85e0ad6fc9cc4b61ea76dc4ac3ab2c81e1628c7cb6d901"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "34dbce294c7b4572a9421bc2850dfe0217924f30e4ab7496ba2117782817555c"; + sha256 = "31588cd5fda9eb3016e65ea2373dc1ca8d8bc1ab76a39e3ec805b24d017e4f11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "de221fbc6c1a1787161282fef3972e7c43e32fc42d1544d79207bfcba279a685"; + sha256 = "222b21e3d732de1133fee305c46b62b3234efcdcae3798cbc0a74aced1922067"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "40ca8676c7df07ece83999693fa40288d5125507312a75e012ad14fdaf47a5e7"; + sha256 = "80980c0db12255f09e755210f8ec71c7e9439ef1745fbe8d281b8b0ce5c65444"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "adc3c8fb811605c1fa67173cfa65e4710a30f18b77734239f346eccbe84283e1"; + sha256 = "fcca230e6285991a8b469540e6a819cda8b9b769d9d98f3ec40241b377dc6953"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "98039d5decb131bd0a5ca5b5fd7f439762ddea001d72ad96dcb548057e010262"; + sha256 = "63350866ecc7ad6f902f22945d8de6c5b2b5b73a1c90ceceb16221ee0e1d2864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "602632d386e5a1db4eae14341d372b6306e4a47ede9c31feb9d798884f198389"; + sha256 = "b25a150e4de973c77a935635e2b45d34c476c766cda415d3cfc059265b4714fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "257a39b133b11ac93ca854147ffc33dbfd1106a3ec6d84d9ebcc778800a05dff"; + sha256 = "74e94928ef4e49c5dc5ad49e56adf5fd958b362192c711c8405b63cde43138b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4b6fe5fd644a0e51c1e17febd0c04dd7520c1cf0cc1077163313b9f380b4ff5a"; + sha256 = "0f26bef2bc97755c82b4ff38480c5763fab1764cad82f398ed8accc4a755aa71"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e257ba9c4aa57a743bd5e2d6522d211ad608bad7a1306d7f41b1c7c3376926b5"; + sha256 = "efa10add7c6198d2709e0943ec52675cbd98931c8ba6a2b03240210e367bbc26"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e5e260ac7d309fe9dc17345c5abb20e820b7ee6942eea003115ca479452436bf"; + sha256 = "c6189ae86a6c502c0e6ec5a1110cae5fb49377eaa3a3d72740661090731d900d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cf4e3470faa67eedf66e74f71cdf7384f3d70dd54ff2ce9618d5a3e93b426ec3"; + sha256 = "91a9ea6a270bcf43f05eee0d45c7b1247dc6bb1ceb5390726f9b582cca91e0f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "691de79c92a0bfcafda9a5cbfab41cd8b550f2b194fe383018e2f4d8ea5d019e"; + sha256 = "3ae6ad9c2a34deba6067fadde0afcaac784030c839729ed2449784350a713223"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4a637e1810e714b1612453ce9b17413e4dabea2749ef44cbdbc0b9e0bbf54250"; + sha256 = "e3b221495a989ffeb3dd6352c29519764554f8e06591b2cebf70039c2f4c7fa0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "108e0d8f0a776628d3dddad21eafca8ce9a081e6138d08ad3cb05eef49f1a6d1"; + sha256 = "13302a48b65fcd0feb9719199f5f997737e7458c06cad6d098c1838fbab2904b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7bd6fbe3a24dc27f27222fa7cf304429e59e95e3be018e16ace731cceca4552f"; + sha256 = "2c94a010840d08035a7f11e40d7f1a92e805aa70e6348b1802b7e1dac3d78307"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cf49aca1c480746a7190d14299cc97425f391d46e02b62034d849278104454d5"; + sha256 = "e0e38869b9d299624623b0fcaadd5562b0a1c5f9ecd897348a495b48a969ceec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e8c34a49b97eee63712ed4aa7209fda04a0fafb55d6d9cf560e76c50b67befd9"; + sha256 = "964f17d9129fa6eb3a3ed6b30392aa5f4fa19708bdf0dc4f0c1a0db32df0310b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "52527e1d66823f8b6dd0f160bb659eab2652a0edae31cbb1326ffa59532a301e"; + sha256 = "9c95ddcf7099e8d88932d94431610b21ed24d33efddabdec47778f5e67351836"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "12f0da186b507d788767ca0e085fa894d3df3a07897246fed12516cf4ac72705"; + sha256 = "e4e4a887b1c2cba684ba2528c6cc471af3bb82d8d9a2fd1833930d915a2e16bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a86f277b73ce624a52c52cf63f3bf84c174befae09d45187ef3016493b616fb0"; + sha256 = "c73b6f01896873de4388f73e92fdcd0d04d7dd7816e7827b7a6aba5284aaa03f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6ddee9113b1d6360718decf4e500778da5a144a9f023850bd73b5a7520b4bf80"; + sha256 = "aaf0343a3e3c8cd9ba4b9e61b412381ddedc124a14646379904aeaf11ed4dd79"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a55a695613981f1748e08ee28aa7c17896ac1218cc3fa935e762941218ad2c60"; + sha256 = "4420332b3105bbc53dbbe1185a554e208e39ded5541eb7452add0f8b49e6655f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0cb9cee504d8aa9bd544f863af1f3806dbf1029f35e3eb7a29af949b34ba45a9"; + sha256 = "2936ac1de8e97ba8e393f687efd5bb3b358ee3c919b6fab7f20d04e46d11ac23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "dd7f2d94ba8576fd5099f4817958d078dff79cc6b4e39557f3fff26e8342a8e9"; + sha256 = "b3e46bd840beeae40cd3594626b86a849d31e30b416ec477fcd99ae98cbfd87e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a903679b24a1db6df01fcb1a01083ff63585e5e79adec5a91cbe27c69c71ba4f"; + sha256 = "19ebb27df8cd258410d953ed54a02281f33bdeb892060db9fc43bff81cb8d3fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "01b88e5d7d2d87b5e1c2d8a7c6a9f06e5b4d11162c9623876ec57b90820347dd"; + sha256 = "d4b24f8468891079e86136ad2ac99240faebf843672bb839cccf42203fb82a69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a0b653952b06c4fcee6dcb095f3738ddc9be9169d235d1c9ddee541ba5bfdad5"; + sha256 = "c534e8a87cec2f0e9ee0915bf74f3a3a268112ba2eae9907e2850a7e6e294fae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4b873b6f93db430eef7abcb2da88fb6a525bdaa3c7f2872cdfb8f420e1c52479"; + sha256 = "ee475ed9aa8c00d6dcf02f817cff43f689334d1c9f16f42ebf2b45e5f0812c0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "eb542b6da6754fe3885509ea8fd694189f9925a7ff50afd41a449177b9daa059"; + sha256 = "326df9dedadca13f46ae26b8bef8fe9127e0588f84d839214bf52ef013dc45ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "26f12d96589d5ba1371da217aad512fd3724e57c4088153b40b24ce60887824c"; + sha256 = "c222ff822a6433b216ad164a5d5985cbe046e220a5dd7f4f1e043531e07ef457"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4e5b2092831a070f2cddb0ed422e4b0af66719cf8780c2332c7b0b0f2121f07f"; + sha256 = "ec93394cefc1c458349a5b91527e4159e6958614b96d626e15c751bcf31dd780"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "05032c39093c377bd6c419525e291e049cadd54cbbe33d833ada6f8361f6ae02"; + sha256 = "ffe3ea9129d2aa1d998391965f5f7c58867226e750fe79282718550983d994ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "425aa0b2d60d26dc45c1eb5af753b02e540518b0fc683194f785845ba1b6d500"; + sha256 = "c3c68bf3cb48854238ea83e95db04006f099e378f5f073f93a460b61a3ca8298"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "8c7545cb5fa747f37f82b0dbbc65dae682c09c68b6e27803639d2002582f182b"; + sha256 = "f348f5400fd8f9f7272193824bf873b171cb01b3416e30d7697a0206439ad0e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ac7614e84c5affda5abdf64128e68e82437ccedcbd3474d6fdf5ce96309c8782"; + sha256 = "8cb3ca91aebaf60ba754bc2f3f9ef004a4b1fe2f96aa9699a651793929548fb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3398982406c71be6a4ac6ef4655c3bead6e542e1508d65e59eb2b7c3f8c8a5c6"; + sha256 = "7caa1d9b5167056e64407c87126796e9b2c3595fab890ccc8f600cf2d6ba3b82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4a1952b6f9b55bd11f6869b1cfe08367f5f1c7b40974b6518b59ed97a9728a36"; + sha256 = "0596297cc39de0580f5eff0e6bf11ad9eef58714964277df24afbf2266f78169"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bcfdc04f07d23d3dbf30e9f3909ca402baa366bed1d5426e23a409b56d0d7186"; + sha256 = "c232615c60808666cf7eb42390c957ace79fc2964539dc9d78337db2c82a8df8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "e192623c19c577737184417438d831dbf447f9d917d9d6deb1fbf04048b0df8a"; + sha256 = "ef5cd9a9677377fe3cacfc7234e3180c016fd0ae8809663966ca3f735b996efb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8238a41d7a19698c2ea20ab97977283d9dc084807a19e42dab90c74e8be3dad7"; + sha256 = "968357070418cb7175b438e0192f8eefb42e3fb7604df9bd08e1f060e7cd6ac3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e1f5077c5ecbfa4032957e29d9577377dd4408a644a9079a086dd879477d878a"; + sha256 = "44828102302c416f2cdc2858aecf843d72e0015a743a4a33a6e1256449c686b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3cdbd71fef15807ecf86f583e02277bfeb70a85536e9bba9492781305f9beaea"; + sha256 = "b1d849e2af49f7c9bf7c05870fb79ff6e0f9ee0fb58513987632847300235e53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c2b2c0f954372b2d69ce7ec2a2c5a949902c45d1418be549b7b8e107e7d1d464"; + sha256 = "99cf9f0f9c853849a18d0dc05c2f8416c42884bbf92d8e046e835ae09b800f97"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "45ea5e64ff8e10598c78e837477691f049cb893a21270d40a3e8ebb6650248c7"; + sha256 = "664c2231fdde88b8d2e438429a699cf98c878f41625b89d6a5b14d2270e96fa0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "09662dfd9f3dc6d88c00e8d57738359b7679a869398f9d4491d0dcf3be1d9854"; + sha256 = "038477815c83f2566bf4c00cffd37ba0ed60383c90badeb685ac95bcd302d0bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "33fc4f9ee860528714672e0348d2918e2bf497b2cbc30b2f7cee508de1823247"; + sha256 = "3be063a9199cfcbb08a59e448c41b6382d5d13e998d6a3d4198f3bdfc389ceb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8d9a074d4c17b8b7c0ca9b504036c21ee20c471f6b41e02ec53c8e8e6adcd716"; + sha256 = "3a80f9b8916d2827e0ed0a7d6c4e968aba80c97e2d1a595b8a0c10f226849d16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "f2e43929d8bb5bb94e3ccdbf7aa4408adfd1fa1c680b7d6aed52f6df6cac9420"; + sha256 = "cb171a6f21afe5df09f41b11e68c6cb93bfe8c64f1c32e75ed248d8eb7fcc055"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5531272fe2865d652e813a12995280042c70f1bf210f3a4228f250c2cf71febf"; + sha256 = "60bf0863d527971f35fb903c2801c7b607d43d882ba4ff8be7d1da3ba7ef9cd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2aad34a224f7ec7cf86ce5cd0c48b0a3decc8ee5f302b05205e524ced93d2a59"; + sha256 = "16eb05f365b447a7535d12388d27e2d439d6dbffc44ffa1dab2319ad922738f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "cd46bd8ada1736f1f0a3e3338e53a7cff1717a5d0338daad480141865c0e826d"; + sha256 = "b008823c635128eb3f25e0594999cd25a7264355be82b7c30b3fb8ae7a2ede0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3113dbdb51a654d54a9da2e79a5cec42cf274a187b255a61a23fd22faee07ede"; + sha256 = "218fae2f2f4a6e0f2c217ae35d6f7b62d955ef60d1de0d923de05dd6f839c58a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4482f8870fa20bc75b9347b47a642782a5f88d42dfc2b9fe174591e8af870161"; + sha256 = "ad28b1873e2c7781dfb14e8f692c08f549496fc8afbb4eb4ccd49ff403e221d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "33bad00acbc7662c1fd81b376878e24f0dfe5ff9142c694d852ff069c05b6c76"; + sha256 = "9d8ac480fd55cb749c6cf8166d681b619310dc25f352d109004a61655d0bb779"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8a3fc6ded7317446a99571f5660b421b3a5bfec77bdc7e80e6567348a941ec2d"; + sha256 = "7c19126e32881e496e538028dc2a336cfafcfa5ae8e53d5ae1f76415829adc7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7fb59762a36306e6561c2c83dab581f4ee277dc802d77659f0c5cf5e3cd7c3d2"; + sha256 = "4fed1d825342d963e45b81b9931f152c4600494866f54795f353ae1c84c94e40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "45193e1b8c725afe88c50ba24b15ed58ea5b0f5a3bc12bdfc98c643e8d7fad5e"; + sha256 = "6cf56b2c6a0cbb6fe4161e126595f61cc0b099b526c2cbb44f5024cdc428fb86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "63b0bf93b3237f06bbe1a2ce957fb491cd4532effe61af63fcbddaca061ef7ac"; + sha256 = "bacdc8db6802246ff6293f80027eb690f02e41eef04ceb1155a3ef35c99d27d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d61d89fdfcd3d3b7600fe34f756e771f3f90d32bb90516380d797302c34694be"; + sha256 = "1c41f550ba2c67d8dbbecac783642e2b21b04e4d3a6fc1bef7d9bba0dc35638a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "e66f2f991499b913518afe5a53e37115045fdf834350faf8b644df09e7364ec8"; + sha256 = "3a2eb5827dce67f9f5ffef0d68ae8b0a38bcb8635c77e3662426c6068c340836"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "52b346ea14a7b0ad74dadbdbcd3ed46d320cfb4d7f424d1fdece03ad4d1f66b2"; + sha256 = "daa0df7174e377c6ed64759460d0a7a98881a1afe1e366c5047b1dea23c7afae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "33e707f78d4e71b319a1e65ad9fee16ed0bb81623180e793ed8666abe0a11354"; + sha256 = "636e32c6b2cf823895ba1fc21c49a93d845285f1c0bb4d4edde05c88337f273b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2c90f259700b549c53f181e033fc4e09d5ba2214138b6f91b8a460421f7f6d32"; + sha256 = "cbc5a4a80bedfc115aa3d8450b809ef39ef80a6a5ca7446b233a11045d78da1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "8bb0dfb593ccc5e069884a94afe9e887745210a90788479cd3138320ff040256"; + sha256 = "11a799ebbc18f489ed0043718c7091d352d21e8f5669b841eec17c3b930e15be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5da0ddff94084201d97d428f8042218f49393bf55654caa70791862f9b320910"; + sha256 = "e491a0d636a602d8881080f237c55583270d0ca62b3350905deb8c26d092b190"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "20232118c8f7442381f7833bb749826bdc9a9519e70dbbc104a5bce6b9733682"; + sha256 = "ed3a53f09502548054476ae26475de0068c33c1dbe2080b68dc88da2c6c07f86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9ea61d47b3d79c406ddcb85b459fe61bcfcb0dedc648ae89133bad80144aa82b"; + sha256 = "7e19ca96797de41c55f2d81e17418f4912e286099193c4d23356432d937dd467"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "770a816ce4c978629b30d66f13da2b8de2980810fdbe3598338a95b1a77ae68f"; + sha256 = "23e1ad144a6564e91420ff1616ed81b577e15bb2c48803dd73a408788a791e8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f14d885a144bfafe40f70862c50cf516049459f4864f272ff3d269b1b77cdf4d"; + sha256 = "32b8631482a1a27aceac69aec87d4094f7e7a8dbfe04310cda692241bb1d51b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "a9a1040e40c6702a95db4d0d86fff33acc0ad55f5bc735ffb3fc18ded6feb79a"; + sha256 = "575ac3d86f62665a4c496e634778e3d1a7258dc73f6c2ce6727e2a96e9d2ac03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1ac8221af8e449607b71eb3da8f8946e7f2fdce1c9165578387342ba61c6fb48"; + sha256 = "5e5c1f70fda621f566064248bfef9fc1629c81acc31fd3e21b23d2b122754470"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5bea3737723b4c661be9b7beb69cda311c63b38fe5d87cf1344c973eca335594"; + sha256 = "1f622038735474932239888d00c47eb8a8c719854340a838cf580ecc28a8c1cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "37f1d42a53760ddf9a1ed889e2882358592f78494421c7ef69d01a2963c684e8"; + sha256 = "f4fa8cc59a44bcefbcfc9d41ca67f1872f29073b1ead1e4da576091605721d86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "77584900b9151192e6f265e49ecc2bfaa0028c25b5cec613f384a30d37139f8d"; + sha256 = "fa764b4dae4384442f1e2c4424b8b82678a3910a5873dc068b605795ab803673"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1f8521e35a57059bb3aad1d5fa95ac775eda03ead75bfe6116cc67ff587db40f"; + sha256 = "c16333d4334148e77f4c36a1dbdeebbad52964af903f4913cc12a76997651585"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "89aa8777ea726995b70101bef359b3cf13079520c445a5d44ca6434bba96b0ae"; + sha256 = "49f5bbe32fd51898fea03249af04cf922891fa57b5d03afd49b92a7eb6305fa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "987e645e8d7a6b770a3056a115975a9a216143aa05e7ec215c83ad23b77df1bc"; + sha256 = "4b5b5a07a09fb47451ce79aa9b4331d12e64222e7bddc950db4e8c4f660e682a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d0a1cd64c2ba6d86e405bc05ee5b172f4c696682d2b798bdbecb91da718495e6"; + sha256 = "9ecc41b2fd42e3595bff98aacbb670081340175c1594b2e5e863d49be9747575"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "fbf403d72c4919e096d6109250a4c790a2a18bb02561f3a3bb690c2c2e1ac217"; + sha256 = "c14cb71af1fa07286df672db42140528807015e4c633862f145d311ee67d211f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e5218c485ea7ee01e739458fd107f8c29547c542a89751f82f82a3b798c4e6e8"; + sha256 = "de205306cdcabc1f8764e048b0189f31dd59265282a0d48804dd5e01d65eb4b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8ba466d9fa8f14b9821848978adcc5ba96b166848b9201925ff3004d4e1a2ef9"; + sha256 = "87337c3c036f2dacce295ce3044f313266910f7911037c1d1eddb7c633c79703"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "32c4b2e802a41605096a99b2097c2a00ae7c15c26135785dc8705ced9b6d7f94"; + sha256 = "8bc2cbabfe34d0bf8eb72f3ae9a5db6b4da83b659385c80059ff468f436e122c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "fe8ee251678725a011273fafd04670b3d720388d9a4f04266b947bc73c815aba"; + sha256 = "ae1ad3d5c365a96e4ec862eb59cabed185e0f5ed0ea1c196a726db8307d56722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8a2980ce33cc992a7248addb48826dc8ebb553c768101c01edf4d26cf69d86a4"; + sha256 = "c7f7c52b27a98a6ec5620178e0d7d9989cc80ff33d8a8bb8c9901d14d470ecd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cfaf1fabe0274e256e74d9069b89017fe8b7a556898f6730eb9f95cc19cbe0a6"; + sha256 = "5c40f644cdcc273a7c5296758c903386bdf72c928d71c598ab1cc524791bd12f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "05841e5fb59d95a46d0cfc82da624dfe9baefea66916e35ee2721c9c85f86986"; + sha256 = "66cf9339ae8c7703b23ac94fbe4d641b3dd2d4201011a49c3d98859874481fe8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b73618a25a2e274208e9873a3f71a1d87fe39b7a1095fdbdfe1de44a3ea5b62d"; + sha256 = "6424538eb209875fa42391bf4457b1160d066ff94cbcb35cacb4698a6c87a158"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "72e81b5d422b6e67f0fbc0866f162d3a9d61d6041b964ca68d7308ce6e320152"; + sha256 = "2d24a51753787c300fdee4a837d360706a206d81063ba90e45b0a39dfec19704"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "09a284cebf4a9f913b77504f2c9a8e2ad2e6ffd1502ad6b996c674fd1d3c6099"; + sha256 = "e071a830171829fd0ae7407a0e36e2cd4d732d0bdc5d95f308ae645b15e43352"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d359828d106d6d8f3d230d96c479f722333f01bce1edabca23b8038aa331da76"; + sha256 = "28f1e8e0e4c663d1f4651b598f0981f02170fb70f566b56ecb4fa695ad43b062"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fafca6471669a4da24bf97191a49f26a7c65b4a1c53cc06b5e3803dda217c1b9"; + sha256 = "8538d13b4036fa20eb9f05588ceb58615e47a91f40e52b80fe8bacb0815d2280"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "76c96649716666bbedc187e0fdf92f7b6ef5ead7df48c43bc91b650e72636d3c"; + sha256 = "5db06424e691bb8a38752f8b4479682b211b944054b624c6fb2b0517d6dbe8a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "be8279d893347726c9ebebf9299fa8708c7c00815fec0458ac7a3acfd926877b"; + sha256 = "0d239d9d7f6e7072d44faa571ed47c1943c6593532e8f5d13adcfb3c6270858c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "e4817a0d0f17d0346da545dab0352a24224d6d857e601f6f7742d2989da5d15b"; + sha256 = "0cf201905007894685d3e2f2a5555ba478385e576546112912ad51304aa0fcb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "151473d60d6805f01bf38996d5f73fa3d82ede2b065d911a8e14a16cd70bed96"; + sha256 = "4390d196894b898724dc31ccd30d85795a6094641839ea3b688253fd7fa59925"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a5a2b8136440ec821b40a5e8b7f7e4562ddd7891a841dc8802be80a59e5f1e12"; + sha256 = "07f04a17bea08570c902a7588b770a0b32763a792de46b2c6ebf4c6323d8e72a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "622ce9d6f24fcd37f8d8ef5a3a9e1a732d4bfc2f603de80197ceeffcf9b6696c"; + sha256 = "ab87018a5cf04c903a41bee02528796d5537533688d50e21f66dc7c5210e2197"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4adcb05f434f997df7f46fcaa19df53f58dac17df707e57f65cf6eb6b2b8f4d3"; + sha256 = "d2b36736a16b6673d9051cad9df7bf503903c09b0bd4c0492c3445a55ee11f9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d51507f9da81d364277456513f4448cbe32a15123b9b2b91a09dbc856293ad96"; + sha256 = "587333196ad1a404bafca6bc72a9fa76601454a1510143d8ac1aa3a21b2ac0ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f390363b651338dd150cfd4a52e046c790ea0213cf8ec91ba57a0b89fc1f1b63"; + sha256 = "f5fd1e4959895c253186feedcf64abe577452c7099778067046438f6409c0f4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "df8eab1a07e1e54bba9748676c9f59b0f1145ad877f5e6ecd962f1aef797cd1e"; + sha256 = "f5d3701b4ea8715e8ce3d8870ca2ef103804b529006c264d35df5174048cac7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "27c4c32368e9324cc64bb2cf91d43254bf4b7c80521982be32f75ef495ee3f0f"; + sha256 = "cc3f712afd9b6866798158be07855cb49a30764a03c64463c458774bf6303af3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3936fce57b69027bab9a96590fe67291ab1480873c0a68174d0b0fc61738fd8e"; + sha256 = "3833d16b4b9c98547f9f405fee4d150763529d4c87e09d2ae1e9c62bdf09ebe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7d881992dd651be4fcbb50fe5b4c4b03badc9f65c7b6952c041466e44d7d9641"; + sha256 = "f9f6802195c74368f4306470bff9352644f592f84334104ec2df829118cd0889"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3f831ae076063d9209df8cc70feb71960a538170323b775a4a4ca1e9ceb4edfd"; + sha256 = "da459abb9b9b55626c11b4ec09e3de6b4ce64928e1af8c1c7edc6937d9df2fff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4a66a862bf8c549010ca27b43eca9c09f22fe4630155e8a2f7130731aa6074d2"; + sha256 = "34277bb22941f8a3e5a71646fc6a1304660a6087f66fbd6e1066ecc3efd952d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "90d238251b4da6da55ef8b435924ca26db43d0aedcf870b4890c98e50a7ffd07"; + sha256 = "c3f2695c4a3f15a60a83f6f1561e451a75ddfa25db6827541be3d948ee3cd5e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a713d0029c0d847427ffc3c2fbf098eb37556c4aaee3739f8596fb83a47b0139"; + sha256 = "b44069f8b898d751dd42825ed55a216b7cb2b78dbc187894ae886cbb0ce1303f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "40b85698fdc815fa8646c38a92fa2f5303535e89dd084a176f5257ffe9d1f3c6"; + sha256 = "d566b05d2de587f8f377f0552b8611f3232a1b2ce71270a956690b04edeaa8a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "466b43b80e14ac93c65cd14a8397de012108fb9f4ed2e7e2ae3101a4274ccdb9"; + sha256 = "5b79674af83be412e986376807a04ae59f5b96c4a59c905c951b7b29baf76cf0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c192d0fc009525cf37c1a92b35447d36e28f7f634cc4bdf17d4a081d93f4de3d"; + sha256 = "1324e8ca99b2e7a9e7d671c0dd066553dd2a60f5f0535103d372aad287e36281"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5f89a19083afda92007b8b17768332fce88abe382ba75223d4773914cb350391"; + sha256 = "97cfc20dd249d8934d1e92f0edc9b4db9fac00e1ae3f6e256b4cc8e960bcbc66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8630b6b872a9851233a47cb1826d26fd54d61b5191f819f8901581dcee7dcfbf"; + sha256 = "746186d77f3bfac4ea34dddc6d5bc0fe1a1a2fdc1beaae6946bd58a5415bb732"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "443ed4b04c8cf2643f26b0f726466553c79e8d2431a2e85f2405f30b2ea00342"; + sha256 = "48e2283eddc4f2eec476a7b847997705686985956ac2bcf0677b06600d2cccea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8e01e4eab13f7ea9b78ef2f7309063f117221b402c907b4af529d2c59629acad"; + sha256 = "8255888fa2771c50a7cbacca023dd2218908b46bb52a4a070073b89af86ed9f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "e2c2b109bac9ff9d513a8551f307258afef9304bf986d8834f21b9619c6d360d"; + sha256 = "17ac76150b550f26af69b7cf36dae1441602d3bedf7cc8398f102b6a41b00775"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c285e096e7d8da8c6edee6c5c72f6429b2aca3c9f95ae77eebbe5799206fd53a"; + sha256 = "794c3566a5ec2751dcde9b0038b0d11f64d5443972fba058d8c1d66e2a768d7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "11272290885f5028fbd9190a05656074e24dc8cf1e506de54a77cedc861645c1"; + sha256 = "5dcad09ef1e16c8c8fbdfa76b180f66df354dd3a3184a95a9ee219619d623126"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "770a9bb5251c933a000be6529ad1adc67d14900acfccc8f07b3a32fe4e2bbf48"; + sha256 = "67ea002179152fd697c2b7cc6028f67eb8d1809233127ad3a79e48937874e479"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "73c74c2e358ca4179d3e2261c439a06b8f6b22217273165aa63f7ef7778f965b"; + sha256 = "ee90670d050beb555b8375903397cf55cc9f4a54d806a32c9383150799b67a9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "493ee4f4eaafa98d22d734b4c037b454cc0fea5dccd5865c17c7523f713e5835"; + sha256 = "b47befd2ad2eaf66842e159601bb312dad71b665d8c8af9eec5d2ba646e26fc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "3d02e80827959d4aff8a78cd9e681c1b5ac24965e9f97a0912b9dcd16ad1b69f"; + sha256 = "33dfca6116afcbc1edf83d4e30c32c3e52a320a1b447521a017502a2cf2abc33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e94836fed969144beeefb6aaa1f8fa4ab463e17d03745f9b594b7a7307710133"; + sha256 = "310f06f2ccbb321da8b2f7ea1b302f0c90fa6d0d19aa4cac40e08710adb42c49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5d7cae491b790b35f3f54a5f09f8f108488ebabbe91c193c168ba8a9d0111810"; + sha256 = "4e8b59a810144fc8407ffcee81bae69f3b3b8458920eb8c30affb59e432ca49f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "37d252715814c726ff098be56ea4e9f0ebd2060730bc791ce94f5ac09a5a9fcc"; + sha256 = "3fc8c97733acab28b7b59142e8acd6438251c83cdc7b37ced2a74c7ad5de9af2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "35780666ed985a7005309225960abf7641fc94ef51cadfd7b07e13f10e21b1c1"; + sha256 = "939a528486c9e9a7d5692c9c248aa8f2c9ba9d86bd6508fc1eaf84f8a21c8731"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9008a849b7f19ced4bcda7180bad556bf7ba99f16b2decd227beecbf87353c38"; + sha256 = "01a5fcf60e9599128f7d5663d83428825db59d5a49139348c3b3a5fe48ce5d25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7ab1b728c8a008d8d483f8dbb93498f005956aea5bb880880abe0ba07a4fd63e"; + sha256 = "4e8fe32b83d51a01c1a718fdbdf21eff87f3388995426dca460a583b63a8c3c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c2f7948a00fcf8553ef197a8d459595e05022441739dd14eb44bd809d9f2ea1d"; + sha256 = "2cfcab5226ce8901cff407c9175a712ade1bae871be9c37f044e88babdfdc68e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "98b006c8cebf43271bf6626f695f315b94b3cf3bd4313e4e6919e0925570fc32"; + sha256 = "2bab73df49224bdb79f6d0db857d181e8a0153631eebe4b54c40302dbf664ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0e9310909e050e3a3a7903279e052c259658642a806f4ecc19ab941c3f8cfa56"; + sha256 = "022130cd8d3a4f13a2734b09eafada4cb3582f0a04771a2b38e2e8782a077eb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a2821955bd876cc0e5ab8f0695c378f208b11b6b26b8ad80e62de3c0632bc516"; + sha256 = "d4804bb273803d762711416831ed6fadfed28e09a92cae166b47d436fee3ce2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4e69265f84102ddc8633dbd9dc9b42f9b763d318f9cce6323b24915901a2ff4d"; + sha256 = "e7e0bb5138aae26ceb12aa014a4a365d69141a3f6d0d437e5d9112a1e1d9222e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ed8365be83de63babb9e779fb676fc7165f5d3dba7b77b6ec700220a34e996c1"; + sha256 = "09e93cde46ee4d590c233a5a1731657722d7d68772867a9601b9d561e166c8c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ae139d838e133ba25c2c179993a5281d581cfc565ea2dd907e1bf9e555b891b4"; + sha256 = "cdc004090e30db5bba10906550ed9532e7053a3cdbd6525280978d06fa87aa44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3cdcaae6f094ebc14d5d52e900421004144dc3525f57c2785aebdd9d285c13ec"; + sha256 = "be2bc2843148d4241f5a59c8cf840552eacff056906f4712172047186d7e1ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "dd46e31c65618c0f7f89199db22aa5cb7a010488e4e43d26e47b04a5ab3fd0d5"; + sha256 = "c326732c2ac6b12ebc2fadb464bff49d24b193e229f32be7c17ce30b8c8584e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "bd45ea0bc293b1b67328af231abbad527845d5999c2a03f0ffea0dbf63275a0f"; + sha256 = "f7c6823d9196245f2f6ecf4cbdd9b82397cbb39bd2be7c3866a6bf592b055a22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "7a7657056204bb6b19b4946491effc86b73360d29f2c5a680a0db613cdca3191"; + sha256 = "3533e52edd9ee565119adb2eb04048e7f03442a59d0342cf63ba0e515edd544b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c03b64e6e7ecb912782e5f4fc87f494ef2caf034985cb7a004477d8883aae850"; + sha256 = "94a37d1d5dc04726f2b10831db8fc21ca48ad22eb08d4bd64641f849ef395d0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a63bd241b30a31f31e25e091caaa8038e49c682c42f25d1a0b7334b0caf03e34"; + sha256 = "53bdf98c1b6f21c8134d3f68241dcf64bc351f5926ee23ef1435d5e1fd7469df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "0cd7e2da49bfb2313e0a798921c228faae3b1aa222c43ccfe1ab059d4a1ac6e3"; + sha256 = "780e110da1c6e8c50a406cb20c5dcb25b3ea9be9701b2136372fb3f08226269b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5096116356ad33fcb05f6bffe454ae54b79eee0ea88672263d7b066acdcaef2d"; + sha256 = "2cd694302448ba68635b672597428a605f3f8d2cdbb22df86c57e28d75d1aec7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4bb412e38d2507a24bd677f6d61871ba3025b12db1de774d01992c00b89e19fe"; + sha256 = "f73388326340bae37206eb1fbbf92660f6e8c0a9aab266624d71a3e7b6ab3f81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4e0b947c64582ddddcb7b60e753495353d19f1a32daa5ccaf2703d9aa22348b5"; + sha256 = "2468e0434793844579dcee985ba36920d637e4adf4fdaeb4b7c1613567d9704c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c1113ec613f0640c44cce5db4c8f48f1231773cc78523ea7ee6a239ae472b607"; + sha256 = "5771c8dc7555725d5579095f5dd50ed6e23d92361bfbfed4e553bc358549fa6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c538a9314bbb012bed16f4d16f98e80e3dfe18416d9442e786954fe73886ba59"; + sha256 = "dcd1c02909989a1638dffff4ee1fb75c37e870741dbfd1cd32a3c0b514d6043e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "201acbefe7608a5d0d0ea89f8da966dac62c7acebf679a09c855c1388f5fb816"; + sha256 = "d988fdfc0e57fe822e2e41f6e21b3aec3a6469008498f8a974fdcafe2e042f54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "45661ac364bede078028129a62c856781a56c3f9028d932e87d4218800f9e0e1"; + sha256 = "a98e68d852422275c0529050248402ea9e6729e824cb9792df3c55e326c876b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "6f6ef84f418b307e511ee2623e7e4e1f0f38f81a6a2b2b8917978cab59a670fe"; + sha256 = "a8050a4a065eb9d6cf78e61dce4ae006c7b6d10dc404b1ae4d201c9403852c03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "49b05c0b7b5e3f399f72786326f83b4ea6a93095430b3d6b5c90165a677c9b9a"; + sha256 = "d81e3d9420a988f584564f56293ce4989cb99a9e68beff0bb591ed131baf1d41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "61be51a10a0bc93f04e8995606e381565fd215f8ed308ea2e2b0761c217058c3"; + sha256 = "e020cffc3cc7617bae35ed7675d1b264d77e6f0f76800197790941fe4584fae9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a6c0d272f09e687cc6d66be5995044381f26e03d9d985eebc69e4397d977235f"; + sha256 = "dddabf60e22b6e394e6b1f8353dbed640ef5726c795ea5eee75f5b0256fbd12d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "aff95021c9647e80c85813f194cb3adfe25845397a478e5cb0e2206901c2de70"; + sha256 = "72098506c6015d0d9a419ff59c5271a592118fbcf43417375b6a405ff431243a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "68429a694176e397845a8dc88e145c053eefb6d1ecc891fd9bd119f346023cf9"; + sha256 = "0977603a758eb53309b77743d6596fc7a3cb060d0114c20327ebd86277f11b59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f210e6f0fabbd0c61213903131b8f9a6531eb1d1f473674b91371a22c62bd2ed"; + sha256 = "196e7aeb323c62e50fb653ce035ebe325c94eeaa8420d5d9980dd46bd4f34f4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "604b41af2ea67cc46928e0d92caff5e76b6e5a29ed7b8100c739bfd9194e7576"; + sha256 = "c651eddc5c4e80d6e64b3287e83b7d5dfc6b1966d4737c8cf701b4ecdf076d78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "645d5cab05d4b50abc522e3d8327f658975bd8d60b1a8fc2da01b54f853d062d"; + sha256 = "e67a0a7ef1a21ae11fc17714fa9c689f863da60c7a200a5c6918c3ac9ec31dc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "129e9b5a687ef92591a361f3bb4f64963d17264553895b69273b0d42a1a91c6f"; + sha256 = "878b37478ab82baea6842eccd38ee9edd4062d22344a9d7529368a9a64106132"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "f9da5c5f850314b0a3e17fea14cfd1d32e4a8249bccd8edcb7b5ddc04ae0ec39"; + sha256 = "69bcb64b013ed2287608eaafead61bde447627d29f237a380918065cd5887a75"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7af8a93f0f09203c20081d2635a21e821fc82e1556ae7c8b311a5ea80e23ca19"; + sha256 = "9b3cfa6371c0ddf1269d6476833b069bdc974c2c383dbec2ec493784dcf325e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ce1b86777710d7dc1ed445c68d7ea21b3f0d45f28bfdc816af6da945cb6fb5a2"; + sha256 = "dea871f11810dacb3c8a443d85266357a164df36f8e8ce9aa50617d4e09fd307"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 77e020ff0c..3b4e6cdba2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ , extraBuildInputs ? [] , extraMakeFlags ? [] , extraPassthru ? {} -, tests ? [] +, tests ? {} }: let diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 882345b6db..5f766127de 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -27,7 +27,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox ]; + tests = { inherit (nixosTests) firefox; }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; }; @@ -35,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "132.0b5"; + version = "132.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7b9b3120ce3f5918bb0a6d385b23503ff2dbd0b6171d63ce6310eca43d252537b43cc79ace326d2e29611ae4fb06d815bcaefb63c6942d00e53277deeb0eba70"; + sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985"; }; meta = { @@ -55,7 +55,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox-beta ]; + tests = { inherit (nixosTests) firefox-beta; }; updateScript = callPackage ./update.nix { attrPath = "firefox-beta-unwrapped"; versionSuffix = "b[0-9]*"; @@ -64,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "132.0b5"; + version = "132.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3c2f028ae1d2ebf01a4fc341ee7f706bfdacb0c4dd2db2e3f24b42fe1e4e89f67a3827ad794c557c084a723272928264ae9e0bf67a4268078ebd8e4af1f97688"; + sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b"; }; meta = { @@ -86,7 +86,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox-devedition ]; + tests = { inherit (nixosTests) firefox-devedition; }; updateScript = callPackage ./update.nix { attrPath = "firefox-devedition-unwrapped"; versionSuffix = "b[0-9]*"; @@ -115,7 +115,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox-esr-128 ]; + tests = { inherit (nixosTests) firefox-esr-128; }; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-128-unwrapped"; versionPrefix = "128"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix index d75f70c33a..1ac055213e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix @@ -58,7 +58,9 @@ license = lib.licenses.mpl20; mainProgram = "floorp"; }; - tests = [ nixosTests.floorp ]; + tests = { + inherit (nixosTests) floorp; + }; }).override { # Upstream build configuration can be found at diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix index 04c253f7d4..76c6ee7a05 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix @@ -17,7 +17,7 @@ in meta = { description = "Fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; - maintainers = with lib.maintainers; [ dotlambda squalus ]; + maintainers = with lib.maintainers; [ squalus ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -26,7 +26,7 @@ in license = lib.licenses.mpl20; mainProgram = "librewolf"; }; - tests = [ nixosTests.librewolf ]; + tests = { inherit (nixosTests) librewolf; }; updateScript = callPackage ./update.nix { attrPath = "librewolf-unwrapped"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/librewolf.nix index 46e9b1f77d..9ca55de722 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -30,7 +30,7 @@ rec { cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences - cat ${source}/patches/pref-pane/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl + cat ${source}/browser/preferences/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl ''; extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index fc7600f56f..32941d8d58 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "131.0.2-1", + "packageVersion": "131.0.3-1", "source": { - "rev": "131.0.2-1", - "sha256": "1knx485kdjv8d0rn5ai1x1jp0403dvxz9m7lpim1y2d2ilyi26x7" + "rev": "131.0.3-1", + "sha256": "0ayl43nq3h9a3b4nl7sfmil43v0k3x1bmxl7c7ws8710dj2674rc" }, "firefox": { - "version": "131.0.2", - "sha512": "fb1a1179a8c62de975c93e1ac6f058cb5492e955bbb7ac2d4b83cdd14ba17bdb2450078bd6f626124b14542f3fda9514bea476aaa34ff4f5a2bee6b1625ec963" + "version": "131.0.3", + "sha512": "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 4cd54559fb..4c56b05da4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.9.1"; + version = "2024.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-PFe58tdLc6RtLFrGuL9y+FWNGIASXCDawxSG2He2IQ0="; + hash = "sha256-xCLLWe15+YmU3SyWkclzHBojHi32nUJGe4xY3NZC05M="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 985c0e3beb..3fbe1924e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.12.4"; + version = "2.12.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-CxxaNm6O0wGvh1V0RmU4eA654u2ooL41EmlNX49KEE0="; + hash = "sha256-Lu0RUCSOrNNQ17CZGv/+ic3jPz4+3433JjwnjVzYzF4="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 2ff96adaac..c432ec035c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-AAc680STuXiGEw9ibFRHMrOxGs/c5pS0iEoymNHu+c8="; + hash = "sha256-s76XIB7s92zSzG8GGsJJuTG3cwbGHL7oc1x30k/WoOU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 1aceae0b31..cec05a410c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.168.0"; + version = "0.169.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-qpYTYOzQWhjuVANOPpLDsYZyhvRl6FnNQz5ssDZHohw="; + hash = "sha256-HGdNCGCJ8LsXyRSinNu1EDy9XuI7mTHONAgti2SETWw="; }; - vendorHash = "sha256-pCP5PxxOLlqQBmqufpo6G69v4M+NxMpTlIUY6TnclVA="; + vendorHash = "sha256-zWgza1eiO4UF/RL2Z4R4bvO+tgcN1KT8nBZor/plY+A="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index c624489084..55536c840e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-ksTtjPzEY//JMLKzTMqkeqZqD92euvqV0iXziYQvFGg="; + hash = "sha256-Vyd32T19dw0j7PfuAcs6cuDlAhtMnRcUZXvYtEM7D4w="; }; - vendorHash = "sha256-4zNPI5tefOgLwbzxRM9NS/szlUjGo2BiruqP92qmwBU="; + vendorHash = "sha256-Sh/SsVIque5xdyOGCNU188pi0JCDXv90LlV7NCmgpGQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 94667e40d3..9e43739831 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "k0sproject"; - repo = pname; - rev = "v${version}"; + repo = "k0sctl"; + rev = "refs/tags/v${version}"; hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc="; }; @@ -22,9 +22,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/k0sproject/k0sctl/version.Environment=production" - "-X github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12 - "-X github.com/carlmjohnson/versioninfo.Revision=v${version}" + "-X=github.com/k0sproject/k0sctl/version.Environment=production" + "-X=github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12 + "-X=github.com/carlmjohnson/versioninfo.Revision=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -46,6 +46,7 @@ buildGoModule rec { meta = with lib; { description = "Bootstrapping and management tool for k0s clusters"; homepage = "https://k0sproject.io/"; + changelog = "https://github.com/k0sproject/k0sctl/releases/tag/v${version}"; license = licenses.asl20; mainProgram = "k0sctl"; maintainers = with maintainers; [ nickcao qjoly ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index b0219b25ca..75fa02501c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-Pm/CrB/RxCvEhNdCyfI7kF62cxpx96Cj2zWmW0wl5wM="; + hash = "sha256-ABSjF3Wd7Ue/c+j2BvjB0UgAMccGUgJsj33JHMG8ijs="; }; vendorHash = "sha256-sIWRODIV3iJ5FdVjVwesqfbYivOlqZAvPSYa38vhCMA="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index f70dcee468..bcded90dc8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.48.0"; + version = "0.48.1"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-xqupDfcjCSP7uomBCuFlhCAOetZrvSiKehOgCqZKLLg="; + sha256 = "sha256-jk+IUqM0/7qVKBMFntQFr52B3TJYEGrmT/DKcgfrw3Q="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix deleted file mode 100644 index eeacf4c0fe..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "stern"; - version = "1.30.0"; - - src = fetchFromGitHub { - owner = "stern"; - repo = "stern"; - rev = "v${version}"; - sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18="; - }; - - vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; - - subPackages = [ "." ]; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ]; - - postInstall = let - stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern; - in - '' - for shell in bash zsh fish; do - ${stern}/bin/stern --completion $shell > stern.$shell - installShellCompletion stern.$shell - done - ''; - - meta = with lib; { - description = "Multi pod and container log tailing for Kubernetes"; - mainProgram = "stern"; - homepage = "https://github.com/stern/stern"; - license = licenses.asl20; - maintainers = with maintainers; [ mbode preisschild ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 79ef8a462f..74cf9083d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -399,13 +399,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-FFUmNDP10Aqj5aBWuYYO1redZlXMNVLEskQAjPSgXoY=", + "hash": "sha256-RlJsM5gZPHQxE7Lab2J1MVFL1YaSz2kC/1F68Nep1jc=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MIT", - "vendorHash": "sha256-k9NmPXtvjLDWDGMbloJwErNkzuJVe8T6lnlYE2iO5w4=" + "vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY=" }, "exoscale": { "hash": "sha256-fS7ZK+d7paUoaPuxXh6N6Sw38dzlxOAVCHgsHUL2Gz8=", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix index 4eb04c6286..e5b3222b9b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM="; + sha256 = "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index e8a09f4e73..dca5a0a988 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.13.0"; + version = "4.14.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-qDCt1Ld3xHPexpCv/0SbvQwGhWE46cVX3BJ0PoBsKcA="; + hash = "sha256-XKsP6ZJCY196wYsp54d0OgF4zj0b9H8820wBAOjrDbg="; }; - vendorHash = "sha256-qEIvxQ4PRtDWyIw3MWmyXV4HLraCLSglHivlV7UJ9jM="; + vendorHash = "sha256-6ePEgHVFPtkW+C57+cPLj5yc9YaCRKrnBFo2Y1pcglM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix deleted file mode 100644 index 3fbaa2108d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -}: - -rustPlatform.buildRustPackage { - pname = "russ"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "ckampfe"; - repo = "russ"; - rev = "1482bb1df13738fdd4ea1badf2146a9ed8e6656e"; - hash = "sha256-MvTMo2q/cQ/LQNdUV8SmHgGlA42kLl0i9mdcoAFV/I4="; - }; - - cargoHash = "sha256-ObWrwXMGXkLqqM7VXhOXArshk2lVkbOTXhrQImDQp1s="; - - # tests are network based :( - doCheck = false; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreServices - AppKit - ]); - - meta = with lib; { - description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; - mainProgram = "russ"; - homepage = "https://github.com/ckampfe/russ"; - license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ blusk ]; - changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix index 1ea6f2f8d5..70fe4b26f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-VI1LyedohInmZb7heNoZ/4cvLz5IImEE2tyNylvr2mU="; + sha256 = "sha256-ugDleco/Ep+10ku+5xcW4zq/RrhruZCRlX0zKeXzLhg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 26855ca784..0cf36580bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/third_party/nixpkgs/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.30.0-beta.1"; + version = "7.30.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E="; + hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 8cd6bed359..a4d74750fb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240929"; + version = "20241021-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE="; + hash = "sha256-fO/GSnmXsB4YVnfBBh1IXai15JeRLcAiihufIouBpxw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix deleted file mode 100644 index c3a10cc39e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch, libxcrypt }: - -stdenv.mkDerivation rec { - pname = "epic5"; - version = "2.0.1"; - - src = fetchurl { - url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz"; - sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; - }; - - # Darwin needs libiconv, tcl; while Linux build don't - buildInputs = [ openssl ncurses libxcrypt ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch"; - sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv"; - }) - ]; - - configureFlags = [ "--disable-debug" "--with-ipv6" ]; - - postConfigure = '' - substituteInPlace bsdinstall \ - --replace /bin/cp ${coreutils}/bin/cp \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/chmod ${coreutils}/bin/chmod \ - ''; - - meta = with lib; { - homepage = "http://epicsol.org"; - description = "IRC client that offers a great ircII interface"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} - - - diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 58506961e8..716f7bd019 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "128.3.1esr"; + version = "128.3.2esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/af/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/af/thunderbird-128.3.2esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "daec0c206763600ea16dc09db4c11ed82132bf6ed4275307f5635677891f3d43"; + sha256 = "68e754e3280b0e47e2160d2538dbe959edde3b987a62f05c42bee02e554fbeeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ar/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ar/thunderbird-128.3.2esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "04801b87ddc17b059a61cf4d16e2d7eda45ca96c0de497e93e02b24be8590176"; + sha256 = "06eb5688aeab9fd9c544c45079a5a711bef6bf0710d0abfc508e33d072827ee0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ast/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ast/thunderbird-128.3.2esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "046a8218164d1dc3f7e1b7d1f134c9fb94f9fe30702e7f0ce8474145725590c3"; + sha256 = "434d20e1d20acb0aefbce5d15fb3d015eee1dc474a5b5afae90b7575308c27b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/be/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/be/thunderbird-128.3.2esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2c1bec26b01f2ac25df9537f34582c18677fc93203e94c378323f0ff161ab6bb"; + sha256 = "a4def49f05a1a479c3ac0f1267d4ab65de84d7acbcc79e1c52e55e814bad8342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/bg/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/bg/thunderbird-128.3.2esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "64a6c820bc35b416aff30822417486104bbde4842efec785db6b2e1f35b66b70"; + sha256 = "d6d4770f6707dc8a246eafaa0c3a360fb49117eb2adbb12e99a02b4de2cf1805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/br/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/br/thunderbird-128.3.2esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9074dd4e49c2a73f62cf0454d29e8bdd417dbf129489baca9848912cc60c8fe8"; + sha256 = "e2352aacca362ce56571b1f50009304355e5c2575e0aea3e84f81d386f7e5553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ca/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ca/thunderbird-128.3.2esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ded677ad4962afc9372067f8c87f0d1623275a03cc98b125fd721ef3c3df6028"; + sha256 = "67c31bb9599c181bbaf250c2479188d7fc2e208322aa51737aed83ed9f91299a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cak/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cak/thunderbird-128.3.2esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7ca0781d25f77cc72dcfc1b8ad88fa222a90c8af2fad1535c30f6e0df04cc2bd"; + sha256 = "b7b44e214374a526264522345e5907b76d080603b0fc6b2c4bae9621b78279a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cs/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cs/thunderbird-128.3.2esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e8f6bd963a49342d176c4b45ceb7038c3a18a6002060237cd06c807f27338c29"; + sha256 = "72149f69323530b8e369fb2689a8baad097f23fe3a6039bfe56b24c0a3290744"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cy/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cy/thunderbird-128.3.2esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "97486ec291bbec41a3813a1e289bd044ea3ccea71a66c9182cf13481bb17765a"; + sha256 = "207ee0a8bd84e9e8b1c759a1c9987207f701d0da2dd6c036d759475896a0f2c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/da/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/da/thunderbird-128.3.2esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2f83197baae9097bf2a13f3d781416e32e711de14f2e9e6f3be4ef909975b5c5"; + sha256 = "b69247826491468475cae337ed62c0314ce8ca4de33ed3d8630114fddcaec41a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/de/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/de/thunderbird-128.3.2esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d5164afcd92be1e64887d056b0a97a2c8b8a8e0f8b52d0d71380ab44deb54c16"; + sha256 = "a0ef4564aa205006fd448ddd8d03f398a1fd525c156bbcbcba297a6a2c932cb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/dsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/dsb/thunderbird-128.3.2esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "74552c085365a7a381b634dd2db32620acd3cdb4e3dd8d93d24344c45149d027"; + sha256 = "58eb03368703f0fdd760f04102fd3f1dddf525147fb7e5e4f1919e080935d6ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/el/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/el/thunderbird-128.3.2esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "abb4db492bf0599dc08a0af742a863729abd45b67134a450faf9bb4dc9fbd048"; + sha256 = "1a1c48242ab368a8039edb04093c64cc41aa1885cbe67567340f324ce429dbe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-CA/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-CA/thunderbird-128.3.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "149e106c120954f9d6c8021a426d487e482deba81aa2916cef9bbfebe100f6a4"; + sha256 = "f13a13039d3006320a71a01a6ffdcfebdfa446abd0aadc6858b4296dbbd01106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-GB/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-GB/thunderbird-128.3.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "553f881b15952c5cc4ee31f7fe6d5425a8aecb2e292968972c6a920f2fea89e4"; + sha256 = "10d698906140a7b104484a3e90875b1f0fc2d1d7abe3bfcc2c82ab793a8c7992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-US/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-US/thunderbird-128.3.2esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6a4738c5b07b2c6e8668cccf2c3c24f78e2d8ae7a04a1963638e8404d96f12d4"; + sha256 = "72c185256191a6f1f8b4e497b65dde1fedd919a2251261ccad6da06c62dd627b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-AR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-AR/thunderbird-128.3.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9b886923b198af374e589666abe029d6cf905f5a0e77acccb35817815a3bf42e"; + sha256 = "211d5fbe5d72d5365c74153817fc95eb376d7eb2f1fba9aea1522491fe718afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-ES/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-ES/thunderbird-128.3.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6fad8af3dfba46a88889a147931f202bbaecbf44db174e33237974b0e1d461aa"; + sha256 = "6fcf5a499accf6882dae1c1f1a69da600a8b8ba28a902a6c7a3b4d8de51d17e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-MX/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-MX/thunderbird-128.3.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "76dbaa277644f72c11b2826973253daea1cd263265aac3d393303f3d4eca736a"; + sha256 = "aeba0e0b1637ce57d8ef11e73efbc39e5843c03d1efaf2e9519e60a03d6f50de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/et/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/et/thunderbird-128.3.2esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "89a9ce893dd7002dfb6e249309f25f45bc93ee84a7895c7911d41d7934643686"; + sha256 = "04b7e75de0df9fb9ca09ea2910a618d9c6ed60d9b71c2505ec8850b183ee98a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/eu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/eu/thunderbird-128.3.2esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8743449758bd59afbb83e82bd62ea0f53c2a6c4c61ad095604d5b50a4b7323a4"; + sha256 = "5499fac8f11acc67b1590ca43dad0c136e9c0a00134ff14469265845154b791d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fi/thunderbird-128.3.2esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5a59846d72690a074f4bddafe97d7f088341e8de0c43e958a6d2df7021b016da"; + sha256 = "3254378b2ee27f7462129428176a92277315c0089915c0f3a80dfa435bd2205e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fr/thunderbird-128.3.2esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6de6c9b793215ab2b1c1ccb93bcb535a99a165085842064dadd0a5b42a57b71a"; + sha256 = "56861692b1c421d7f5a90657397b86e678cb6c162853362e69aaa7db4f28925f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fy-NL/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fy-NL/thunderbird-128.3.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ae85b76c1b512ba5d062ea4f157a587056afa859c238b511f8eeb412ae583682"; + sha256 = "63dca4a0a7c71b4d717f92213d8b7524b1eca29ad50e4540edaac148badf0586"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ga-IE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ga-IE/thunderbird-128.3.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "59168b9e0dec31685222fd9bd8b83d0f230d3308484a4a2ea5416dacd7f49728"; + sha256 = "70ded506c128d9e7962dcf8621b772840834f44d59ab1a6a8c8c543175242858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gd/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gd/thunderbird-128.3.2esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4c35f2ea2fb781301d87649111c6d770e94f8487fbe8925f6156cd7227e50961"; + sha256 = "e65b6d02421f5b37d19c6b65cba400d12f64418b80410ffebafdc83b11758eeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gl/thunderbird-128.3.2esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "da4c2677e61e8759c5f4ff5f51f737201f047b5166636000bf73377a0b39c0eb"; + sha256 = "a92eb0bfd1efba1f5b5efe794b915050d3a67c116e78b84b0abce563553efbd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/he/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/he/thunderbird-128.3.2esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "94085a1d0106c7ce6bad8383fa85e530a79f8a38157ad94e5352f45847c7ba31"; + sha256 = "5fe6d0a4b259ddb0e85d192659e205610a11c5f1d32498dc84ff4956ce0ecc52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hr/thunderbird-128.3.2esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49a4dd6bc68b28a96fc59235fa16db4903561eea11a836e62e55f284a1526a23"; + sha256 = "05d9d2a86ae030b7c036292ebbdccd5095efb26c32bb9ceb618f1e049514aa94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hsb/thunderbird-128.3.2esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e9e4ca0683a0eeecdacc7d92d8a59fea75459f7cfbdfe2f4406fed041429f041"; + sha256 = "e9a807e8ac2ee94d2ff214e92e1b69cba5f00c3b9c6cbc0244fea2e9ac2386aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hu/thunderbird-128.3.2esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "379bfeb3e5554643b009d7f62074ccf6e95a6c46807f938e73054625b752f77c"; + sha256 = "0347ccb486557e961ef46979f4a221b8fed55307379d9eb3e77afafc4d07d736"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hy-AM/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hy-AM/thunderbird-128.3.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "37ada95839dacc8907a2dc89bdc424d7dc73aa18f9ecf6c69afd8807e4470d4e"; + sha256 = "636762093f4697a778696bd56864aa8eaae04e48c7f4a4129b116247cd78b998"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/id/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/id/thunderbird-128.3.2esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "204f8b79def7de4a490487588c2e9558259d88ae92a96754579b183639c64e8d"; + sha256 = "291f1bddffcc0dc308a7532455e232d6e587bc8e0a803b4f6dd85f6f80346135"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/is/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/is/thunderbird-128.3.2esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "17ee110e6e07d69f63b64d38ead0691a6ca521428c3716230f8a0aca6e23c800"; + sha256 = "01ace7af5465472c958e3e3ff1784c6b3978a46f3b008fe1a0a556e825d8b327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/it/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/it/thunderbird-128.3.2esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d17a2eb22847628217e7a918c33de0ab20db2576a28ebe177f37fbd9d84bbb9b"; + sha256 = "1ba69fa4e8baaf106a3006dd651c92be6b3ba19701ca8c553fd0c3fc7e34425f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ja/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ja/thunderbird-128.3.2esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "07f36b8b7458d725c8df846f1fce58e7ed2569b4324e4b7cfa1750fbd21b0088"; + sha256 = "98c79c493f9c23a698bf2a6627975cf918bead4e2e7ae9bdf8b132e8e5e205ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ka/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ka/thunderbird-128.3.2esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d6675e3d23156b74f38b3805d3fca6fad8df6a1ec6adb311c1c783d928772531"; + sha256 = "e4e9a739ead52440b1bf0b9dc535d530c812b4d2a91bf6828cbc635f8273a8d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kab/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kab/thunderbird-128.3.2esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a4cc73ef677a343d49b61009de05bffacad1c8cbf368d8ac79e87fe12a24f1c8"; + sha256 = "e36858baf702c8402fa72ac4f1805852dd5d371766e47482f1bc7cb1a73c59fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kk/thunderbird-128.3.2esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4d3d0010e55a9665a6f330e73acc8a9d924587d216c3ec2558e24ba83789194d"; + sha256 = "53e88b687cc6db2abeb3e1f90f861df946c06c6026f4a5cc05a598b3f98ea2ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ko/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ko/thunderbird-128.3.2esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "55ed9d48ec45a9cd04705a8be89701262c7cf2aa16f545f08b361d89d30bd160"; + sha256 = "6a18161a3977fe91e5c878dbf28f9de76c919f753dc1e29211168ecd0bb76ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lt/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lt/thunderbird-128.3.2esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4f84a793e672bdfca124eaf1f64c2753a2a424d2c689403ea8f06ab18d2c0922"; + sha256 = "6cf21bbaf1fee99a86f036e49c56a6c789795375db7b7c2b2d66c9cf4db2009d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lv/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lv/thunderbird-128.3.2esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "28e40e746c71f4d391a3fa4c640e0c248698fba1bcc4f3fa245d98774da0b393"; + sha256 = "ee6207c449bfaf50acbb8d666a87439080ddc6c151324064c6114ddbacfc03bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ms/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ms/thunderbird-128.3.2esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "fb3c86acd2353143535397dd0dc0c478ab1a77ca13a7b44f2d726bfdbacbafae"; + sha256 = "6f73ddde1f47f484819c14e80e9f91be095b6229a69b7ea584b670acfe88af74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nb-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nb-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9ed19c21dcc40642559eed238d40d39b19f6582060f92814279e111e481f72d5"; + sha256 = "64f324a7d0c3cfce88383ca8cb844e29df33f9b740bc6d02c718e8e436a555bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nl/thunderbird-128.3.2esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6ced73e12b0c29295e00f32c72d86389c586c0442cda1592a74285b2509a0a55"; + sha256 = "d7a982d8ba02c6ddad2c1891ae09f5cff5aa80b19e6d2fc26848f8df593fd1a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nn-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nn-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1b2601fd6f4ba3c5442a9108d3647be6ddfa63afb582ea12a949fc082e7ab925"; + sha256 = "0d572d3d4f79958083603e2238b3cfe1a5c7d333a1de5a55f0c320ae8415b4fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pa-IN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pa-IN/thunderbird-128.3.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6489cbfa303b20bd0cf44592ef4ad2594447c440694077c8987d48049aee7235"; + sha256 = "ded2cd04fec68d5639c5ebf93a9f50ebd7855cd316b8135c4be36d15dc03d6e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pl/thunderbird-128.3.2esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "db7dc4b36b5a76e9e7fbd703d02e3d6cb3fb48d2263144bb75418e59c9038f91"; + sha256 = "a7b4c48be5aaa11b836069862bf471d19f7297575b579411938cd9a1b5f19886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-BR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-BR/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "378bcb5617eccb26bc86d6357b35edb343b2f339ee4e35d114aafb788bf35261"; + sha256 = "32a1c309b143c5b2c9d9993c65f3f475ddc279c683d5c6434c1fa92176908e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-PT/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-PT/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f33c33c70d8271061bbbafbccc325206c9b37f56637907a87e4d11aefc4675bc"; + sha256 = "9f3b43fef1200627869eeef5d0814a7831ef6be2b9893cef94f6060ac579f4f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/rm/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/rm/thunderbird-128.3.2esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "40e60095cc4f7e10b052b15a80b1e58228c94b6c77cf5f90b5fcc8cadf094472"; + sha256 = "900a77024280148075888fc3dfadeaa7944b7fbe96cbcf359e3cc4cd421ef71d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ro/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ro/thunderbird-128.3.2esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4b3d0eb8cfe07e345c2effe075b391ce82d75db4ed3c5015e25762a1919abe0d"; + sha256 = "7d556f80f1fa9b60f93ec0a9bfdcc02cb063569515ff5e285aec2b8d6ef3b0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ru/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ru/thunderbird-128.3.2esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "76ab341bfb48acadd8ba0211be37e37912f002e5f814e60cb0c92182c6ffe5c7"; + sha256 = "bbbf234d7b1e8c7cdd71f582f1c4cf1b14ae2e9e695e9edfd56e7358ffcf9daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sk/thunderbird-128.3.2esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9af224be897872875d06abefb82f7d0b6230b3d10bb4ce7c33accab3a1303b7e"; + sha256 = "665f506a18615247a57c7b936d3b4f0fef7240967c2e64e206ca44fe8842f65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sl/thunderbird-128.3.2esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c66eb160c777449c032212972200997cf3303d916f50019db88a4ab21d737126"; + sha256 = "6cb65f62b5759336d08cf4735cd4eb4a4dfa3664786e06988dc5db3fa74267b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sq/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sq/thunderbird-128.3.2esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "dfb18940364e6686a2ae369fb6f5b410e978c42efc7e506288603d0c76ce22c1"; + sha256 = "578d0542d3e0b4615653832d4474d5253ab7f11aafecc4a4bfb370ff14d09c85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sr/thunderbird-128.3.2esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0b1c98eb37db5c6ff1d216a598e352d1a77ec3a94bab7fa49790ba275714c188"; + sha256 = "69f922567c45c44c2902255c6abc58312f625d2be421cbf986a488addc96af92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sv-SE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sv-SE/thunderbird-128.3.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a2916749179de24c63b8f393d19a3ba4ec5f6e77584f44ac5ebc24a4b0c94ca1"; + sha256 = "338f53c983182a93febd49671b73e519da023e6d9653d16dcb1e96d62589d095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/th/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/th/thunderbird-128.3.2esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "bb25041295fac38b2888e95c40835ca289f10be95d71ab32fedb7d0dcaee1c04"; + sha256 = "89498e7b762e95e27d5a5cb7b33cfdcb04057f7c25bbec594f02b5ba11049cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/tr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/tr/thunderbird-128.3.2esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4a512e2bdf3ccadade3166a8acf62935244fc63b760db6e7c35a74299e49144b"; + sha256 = "e08daa81402551cada7b056d40ddcd77f19d19584552349895cb6d206fc3e3b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uk/thunderbird-128.3.2esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9094442afcaabeab3424972cfede908526c7d3ddd600adcae6c345450fb42be9"; + sha256 = "d008cdb485bfa80654acbda091761f31cea620b5fda06cea86df9920f807da90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uz/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uz/thunderbird-128.3.2esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d4969535da853732d20475bfca72d871c76f39131cdac0d00607e0bc5ccabf5c"; + sha256 = "6d73e85cc68bc9dbe519a46e217f2c62d4b002757cac6f3eee73142642259575"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/vi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/vi/thunderbird-128.3.2esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "95bc29e5c14fadafaf5598687f4242ec80cccbd5724988fe471282ea65473e18"; + sha256 = "6f7b1aa7b314f9f7a23bea9f7e5dcf654891f14eadf543603e057a62e56eb1c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-CN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-CN/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bc578ed3316fa130328219d7ae34c40250b57ad47394c4e2113d2d53031c3879"; + sha256 = "4b63f9cc7e02e1048273de888df5238c4e308a5b62caa97b9177ac9daddfaef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-TW/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-TW/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2ec4a508e96715026c4c4541d83e5f14b67c88c9e31e22bfb4ff6280eacbc1c7"; + sha256 = "c3697d78a62dd49b6c9c264809fa3a208edee853fd6f2371a90a3180d88e3ec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/af/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/af/thunderbird-128.3.2esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "75b27678d06857225ad241c90101d39b1e3e42c8a1f1e17f817bc13287bf185c"; + sha256 = "d396f5bd5a22cf7e7edff3ea71cc05922c4b0326859f7460f363eb31df09ddcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ar/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ar/thunderbird-128.3.2esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e2bf282b127efea3c1deeb9a375b42b4425ba30bcd730eb911dda3cd93034a77"; + sha256 = "c095953766c3aa7f1308a8931017b202ef63783562404344efbab9a9367f38b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ast/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ast/thunderbird-128.3.2esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "035213d412786ec052430d4860278fc5c0ffe4b999a5924f3bf1a13683e73d3d"; + sha256 = "1039b107a3adcadc4d1e329416792fe668c0588a4a1e1283caed89789b2c49e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/be/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/be/thunderbird-128.3.2esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8d0aab6ed5c1cb36cc70939545ec0eee2566483bbe89a1b319c63718201ea01f"; + sha256 = "43a3da378465f4e3b7a6adcd55dfbb9a100392d06dd96e49a3d50ae756a3ca02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/bg/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/bg/thunderbird-128.3.2esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f22334ee6b9f47bb6de1623d457aa3a50932dc1f0e047037b07a86793134eca8"; + sha256 = "03be328293a1039ea0c4d05fc8ea091c073d95c4b72dfb4f348f5982647ac5db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/br/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/br/thunderbird-128.3.2esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0c2e506a17eb9d3d23fc366212644b3e3f78be621adbe2410a1ef8ab0803d86e"; + sha256 = "11e5309a82b6ae36906d2285aefca39db32247501cf60a582bfe69a879646a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ca/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ca/thunderbird-128.3.2esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0fc351e87d10b1f33391990716581b4417f1f9759351732ca765e29e9c077c74"; + sha256 = "9a17b59732a651b3247f7af810bd633f07e608ba66c1e7d00b341baac9f0ec69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cak/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cak/thunderbird-128.3.2esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "653eedb42f9327be63d4ccde4e9a15e431235130d70c5e1e4b90ad1766fabd65"; + sha256 = "2796ae01d6fa7b48d22837d0c6f10ba6bf00ffbd35794bb1f38e3a136c8cccb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cs/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cs/thunderbird-128.3.2esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "afab7db6f33f730ad5dcbad73c68aa679eeac995a8f87cd3dd69ffeb9cc05507"; + sha256 = "f2e65539e93222d4a7e552b7f670be776853b65aeb2f7fb144d68072b3bdd50d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cy/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cy/thunderbird-128.3.2esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d4efd6a9bde2a8177c2322ed797c73a347913c7c34eefad3c8059efa3b291e87"; + sha256 = "a59825b1692b9dffeb39bf30ea8b5f36cc30445dcd5ea184cc8487fc01fdff75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/da/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/da/thunderbird-128.3.2esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ed872e714c0ee80a9ae40ca91ef2675aeac20125ae53245b41003614c8ba2a9e"; + sha256 = "d0c8b043c86e83ccc86a728743489a48cb0cc4e46d6976bd3595752a306c0774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/de/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/de/thunderbird-128.3.2esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3feabd14c409d43f07973ae4054ce5a3c13ce1b1023bfe9c9614bad39a36f432"; + sha256 = "917ce52fc4d81ebbe5276240b41565fbce6bdfc53ffa7753db97e7e640a2f90a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/dsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/dsb/thunderbird-128.3.2esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0f9f5e55650af7cb264b300286f426d730a9f6594a1e6a5d9f1305dfa067c767"; + sha256 = "2c6ffd2c7e140d7710e5d702008f85892761e834e81ee1dd80f561e1aa56ddf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/el/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/el/thunderbird-128.3.2esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7f399e76ed236a3067f0e179c1d902561770234a20cfbb78345b4156549a1eab"; + sha256 = "9213a7c441951f9a07766ccff191da85cab2a24fd7fbce1f19bae077387e5c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-CA/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-CA/thunderbird-128.3.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0bc5ef5a3e472463ebf823b16efb36cff728c432829ec73fea7f9bed1c6fcd81"; + sha256 = "77895c740967e60406ca466afbcf294be052a6ee81d5c4b2cd531750d23fa661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-GB/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-GB/thunderbird-128.3.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "22d878733613360bae796d07249fa6be2ecfb12680c7102dc7d6d3a2fb947a89"; + sha256 = "4c547974c874a4ce973b02a890fd12ac917d89c8ebf0a9d332262092ef8b9be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-US/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-US/thunderbird-128.3.2esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0c0a466b278372a784b551922c4c47ca1af8161ee024d17588524d92e4364dbe"; + sha256 = "161b7ea35c5d4c1ecdb8cf0229fbcf3ea152c09c22543e0762eece4b7d6bb6eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-AR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-AR/thunderbird-128.3.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c60187c27a612747e8cd05ec3d6ad704da2c9fbf48ea4d9bf1a70be778047b43"; + sha256 = "bb83137654be3e90cd5c0836342f00b85b065663f5318f562b09bcd2714084e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-ES/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-ES/thunderbird-128.3.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a06dd9c977dbef9679b02a9a36ad75b0929791d7dcbd5a5c05912d338201e8df"; + sha256 = "4744ecee5a3e72560aa25efd25c793b8786764aa7d9f8ac33cf1a33ccbe28a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-MX/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-MX/thunderbird-128.3.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a776bfe85b70468620ad977659908d61e79925fb8bfd36a4ace30dc06ebffcdf"; + sha256 = "6a63c009191b205ced9f8147cfe36a801e9a02d5d74a9a57f66960c78a9b3671"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/et/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/et/thunderbird-128.3.2esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c1e860a0361fdaac8811f25eb2aeaba7973ebbbdcbf769fc42791c7638aa4fae"; + sha256 = "aa2cc826ecbe7397b21a7c5b603026105a5db5ae3d8046ca806749b2133e38b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/eu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/eu/thunderbird-128.3.2esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "88383b1d46ae04586637692c6dcd3a59795519a64db0feb830bdef66b55f8f76"; + sha256 = "28762f614cc70ebbd3d4863a671257cbbccb5d60258d7d07f7d1e42ca3c1b2ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fi/thunderbird-128.3.2esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fa11ef201144fd9f51fa36c8d7cdf3106f445bfdeed203db7f2fe50ad315527a"; + sha256 = "f5b844a279088b43538b4e3f96cfa1c8614710398022d3cf0d4c3c4fbacea456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fr/thunderbird-128.3.2esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5427eb293b84db327fd6002dc84f39531c5a34aff7fe3b01e591a4ff5e243b07"; + sha256 = "4e75cc4efc0bef081cf6e0b74ac7dd74f450dd87a1a0bfbabdc8cdcc383be3c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fy-NL/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fy-NL/thunderbird-128.3.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6a6a3e6d7f2a26f1cc70e6d26741e882e12344836b83735fe0cc15c560b3f554"; + sha256 = "11ec4e4be64feac976e21dadcca77145dc4fea225c0d00c9dceaa509ec61cabc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ga-IE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ga-IE/thunderbird-128.3.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ff9f0296f2694213d58c330e68b56aa657392bfcccd765ac0bf2847155ed014d"; + sha256 = "b4eaace12a57f7b24f56f476fbaa9e9606f25d1f82b34e67cb1a0e10d191e3d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gd/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gd/thunderbird-128.3.2esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "79a080ab46a998ae7584ba26afae53418764b206e44993bb56bed846a6317be2"; + sha256 = "1f669d83cc4caf91bfdd61b9e63e282f90f0d7cbb96c1100c0f904d003f9e076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gl/thunderbird-128.3.2esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "19187ae587048da83c6a0a99e8f72fddf0cdc92c4481d40c534a0664a65d920a"; + sha256 = "5eb51acfb2955bc0038e299d77ed8491648b4d7293d31d8a01648b67dc1e575e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/he/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/he/thunderbird-128.3.2esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e37fd7a629ba735e5916f61a6d46ca71e5698a6d16b73442ed74534f87703ecf"; + sha256 = "87f4fb6eaf8f32e9b041a8d5e5da6072b1106492a9da75a4cac4255ccb818121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hr/thunderbird-128.3.2esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "86c8c6f34e76873060b34b33a235b5696191f3d58042be62f5de59cbb82261e9"; + sha256 = "d93a01b31369d687865d1bafca101b349c697bc7e7b48ff470831849b0444814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hsb/thunderbird-128.3.2esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "80489dfdf52594c34798629d7fef66e67a8b5aaac3c6275e25c092ed0de015bc"; + sha256 = "78d421c94906c39d64013679d786579ae60a574adebdb4b4729a2861e392b5ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hu/thunderbird-128.3.2esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2277897b93514a1995886d637b668a469ffed943c05e91f7e209fab23ee1232a"; + sha256 = "cb6a581fb55422aedb80ad1cf2b67dc07a82f0e3817612454bd0894522a77051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hy-AM/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hy-AM/thunderbird-128.3.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b321af1421b2649d5ddc42a23e31ea76068062cf8a956495969835dd0e0fe7a7"; + sha256 = "b7f29b312f7c26fd5f876d864006eea66977e14e5ff6c761d25b00dedb520272"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/id/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/id/thunderbird-128.3.2esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4c38b3f5afb7b65a8a8089c2d258016dc4c8e60154499bb4ea2c110a29a7f7bc"; + sha256 = "b8942767658f68d76c071a3d4c22bde09e09886a036f3b1e5fb46af18ca76434"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/is/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/is/thunderbird-128.3.2esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d7c2925526dac179bf7c857b9044058818c5a49aeacca405fe120e01a0fdc28d"; + sha256 = "7023c95b4036be5a1f6d8924e746b92aef9e76e8e82726a221473bd540dc3bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/it/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/it/thunderbird-128.3.2esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4c637d4998c5d8db04a7356401eb64cd362476f91ff037979b94487548e9f0d4"; + sha256 = "cd594a8bf3e316e9598007ede696e785013f5a11bd68b14ce742d97abb7cef8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ja/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ja/thunderbird-128.3.2esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4591a2d3b55f402fe47b2f7342f34fcc0e5ad6f5147f72929bef8fd59598cef1"; + sha256 = "c17eca728cf0a861f25fb9cb419ed2c20f979c19c15582b6a17a99544881d723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ka/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ka/thunderbird-128.3.2esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "032fbf3360e7facac683e28a205b53e9a1db756c8bd41330a15f7120ed645b1a"; + sha256 = "495c8d23f24dd7660e9d4836d4cb18ca48c7f3b0edb255cf18daa627ad78d6ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kab/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kab/thunderbird-128.3.2esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5fec42cf09826f24ffeb20a3c7f0c200a1b257e4af4a8d223c4b7f98fb35eec2"; + sha256 = "6fd780bbecad88ab558c76938599a54677e93689d0d451e96beddc886569e3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kk/thunderbird-128.3.2esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "200e305315c566f34d2242fd37bee6f2726d8b6bacb37c74b0e5597e9296df60"; + sha256 = "92d2e2e9e80f75285aabb3ac62edc6db028b15b752a6cbcbb3795566cbeb744f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ko/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ko/thunderbird-128.3.2esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "06f60ced2c75f13ffae69cf2355089c2b343e72b9e61cd97edf01f401c11fb77"; + sha256 = "4ea9a6c97b458928a66341d86ed0fd274b27b1e3a2259971b8bf795ab36656c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lt/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lt/thunderbird-128.3.2esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5d3074b599a9c61357b872f041dbedba6f8667f92a833e6889e16bf2a0ba31fb"; + sha256 = "5037fd5bff06a053331b2ad6312f35af1dd881b2b017fb92ac4c433bf7c10a20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lv/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lv/thunderbird-128.3.2esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "dbffd3f40caa2b2a7f2201f645e27ee5060a124c304079f99055a0ba6bad513c"; + sha256 = "0498e5ae2815fcb979230f3166cfeed89d02bddc9c7ed73646600fca2eb44aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ms/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ms/thunderbird-128.3.2esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2fe336e4ab817e8100ba448a4888cd0bf66728e2779f8179ecfea55bc255e20c"; + sha256 = "bfbb9fa1a5c1d4aa4c9c73c7e02628c1f01c314fc252370fc6a96896a666db57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nb-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nb-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c3096875a2400685f1c4333531eeb3594f598b774f138e746c909976b16b895e"; + sha256 = "da6ce60429e87f38ff66ce975f4a63e1f2e6f8b2a7ba4f895a32760c09fa02da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nl/thunderbird-128.3.2esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3302794bdc4ba877d01b0ba80fca2661098e707f2abb0304bd2c29fc6cb3cc4b"; + sha256 = "514646876e7654bc5a7141d919cce98eff22e07180a37d6765f87629fc48724b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nn-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nn-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "770457094739c924397e643ed303f57a57b9491229abab8d98699a0507d9db1d"; + sha256 = "dda61d6545277b5d8f53100712796e2ebbf3c8b759c4bee0f5c467bf8419d9ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pa-IN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pa-IN/thunderbird-128.3.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8be61392ae2faeba72ae3eaf698339357a1e5112be77fafc5f104bfde3a5155b"; + sha256 = "02b524802db090431e2c1888b1fee5148d22ae7ae7a6d4a22c18afda11bf5c84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pl/thunderbird-128.3.2esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0e0c57066ef2851b6729ba1c6aa192b2b7693cc5e367e4016b458cb45871030a"; + sha256 = "43991a49c7e68753599b4b7b6e5b0d23f199d57b85824ccc56b9b4bfa2c4f7e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-BR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-BR/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "89db9f5388ab006923def3d3818e61c0d0417e26f3c3a7049da453ae82e215b2"; + sha256 = "d9af07aadc66ce20772407de1a458756545775b95b70c8c56c71a6b3ca48cd94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-PT/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-PT/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "678301cd525223c99b5b6f129fddba153bd9766478a8733ebe69ae0eaae40880"; + sha256 = "523bcc1b478dcc9e54a1f4c6743fc546ea0b18956d907149641d34598ffccc6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/rm/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/rm/thunderbird-128.3.2esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3e6f814093d3dcd8df427574bb10c56ea6bd917c1dc532d8334b8880b7e91b90"; + sha256 = "5a6fef50c1acfb0cd2e91d9e03aad4afd688436dcca5280bdb49ba144e97a439"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ro/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ro/thunderbird-128.3.2esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "39c23d82b6dacff632753ba2ba9f0a194c2891cfcc1e67efbbde1f8421085ac0"; + sha256 = "298aeaa7ae0afaa6531a566e2e8ce072adcc62f7646cf33bfbd3acc450335881"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ru/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ru/thunderbird-128.3.2esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c9d051f3faec44babcd36e6fb6c9619142dee3d775185ea86305392f88d45aeb"; + sha256 = "c017f418996a8cc7fb7bd2c4062df1ba1dcf4c2b8df7d23a44fe7e0aebd00b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sk/thunderbird-128.3.2esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "509b5a60e239d4a8cf9a6f91ef4267de44ccc21f9314b232170093fa450af44b"; + sha256 = "84079eedbd6c2a5cf4733f256a583b302209dc84a30d2305b859bd10efa87c1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sl/thunderbird-128.3.2esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "aa5b49aaa7fa64f9e9ea9a01d75da4f5c89c65449d56861b48083ca00a0822cd"; + sha256 = "99651a3c3c28cfc1d664066bf0c197951622e55b21ba4be8f157606d63c2dafb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sq/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sq/thunderbird-128.3.2esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3ffca31bd4bf981110a55eef165d789e253eec7c206b08c880fc3a0b92da58fc"; + sha256 = "47953845a4f03c67148bb183a629a349f3e90bb4c425fc148b1b2cab9f0631e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sr/thunderbird-128.3.2esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0e25ba5b8ba286e81bfeb481f354b69bd56fc727340ce6fde36124a7ce9d330c"; + sha256 = "266e2d380f3607a3da4e68b9567d936a47552bd49173d1a44ecce572cc7338ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sv-SE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sv-SE/thunderbird-128.3.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ab8be644fc47332387f67b3bbe7ad5920bd908e99bf029b85c896a44d3fe8a80"; + sha256 = "0e97466c633f662293b53e7e61b15034d1f88718232e8cfeb32797d4110dd3af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/th/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/th/thunderbird-128.3.2esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6965ca5780abcd2e8e69244e883d171ce541a4d2075a99ae6c0682f4b76c081a"; + sha256 = "18bb3e26ed34c2896a2b5e57d2f740e3870354785e762b7aa827a17b9b8d5708"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/tr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/tr/thunderbird-128.3.2esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e3fcb1b58165e4a7f3553ecf5e9c2759fb831fe25c504365ff0bcd2f0756a186"; + sha256 = "6c1d1f511ee94247f02e4b26d7125ef7e4cd839a508c1be7018127378e80915f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uk/thunderbird-128.3.2esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "89e8999739ac1c9979c702e946130d7bd2f0d9ad209a926ee205425d54bfcf40"; + sha256 = "5b36b7f5efe32bf58d14d74d773cb4cdf092fe3e89e1f2facf63183699967d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uz/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uz/thunderbird-128.3.2esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "71e9b2d9ca7dcfc1b71524e1dc0fbd17f078e690838eee5e711b753bbccc4b45"; + sha256 = "ade3f2442dcc5b6dcce7a8114209bc7bdd3730f7e1ffd9b63b71a452fd9f657a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/vi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/vi/thunderbird-128.3.2esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "13d3365e9643664cbf5006fbf0de101950ca1874283c49792d1ccff437a45158"; + sha256 = "9224b6c394daeddb695b7ccc30c21e5cbf6356db2bd1f7a6746a292a9f077b6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-CN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-CN/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a283f7503a4b0af6349dd87c6be3aa9f4e8227ae98754515b635d602c756569c"; + sha256 = "fe17248658dd5ebcbe3f5d3dd82fa3c20f6b2a82b49e037369d8d8fa9a331083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-TW/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-TW/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ba88abbc91d4e55687eed8fe41aa0e52622b688752341430f7b32d134a750d09"; + sha256 = "057c904f9c5e37a9b43d8410f422bf5838f18c63135add2b3f3270e2c900ea09"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 29f0445369..01ced9fc86 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,6 +21,7 @@ , sphinx , sqlite , xdg-utils +, qtwayland , wrapQtAppsHook }: @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { qtwebengine qtwebsockets sqlite + qtwayland ]; qtWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix index e246017576..0d3ee40236 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix @@ -26,5 +26,8 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.all; maintainers = [ ]; + # Doesn't launch, gives java related incompatibilities errors. Probably + # related to swt. Same error happens with swt_jdk8 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix index 7029dd0541..2ee95b13dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix @@ -13,6 +13,7 @@ let python = python3; pythonDeps = with python.pkgs; [ + distutils flask flask-assets flask-login flask-sqlalchemy flask-migrate flask-seasurf flask-mail flask-session flask-session-captcha flask-sslify mysqlclient psycopg2 sqlalchemy certifi cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index 9484a1c42d..b14b63d8f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -9,16 +9,9 @@ packaging, proton-core, proton-keyring-linux, - proton-keyring-linux-secretservice, proton-vpn-api-core, - proton-vpn-connection, - proton-vpn-killswitch, - proton-vpn-killswitch-network-manager, - proton-vpn-logger, + proton-vpn-local-agent, proton-vpn-network-manager, - proton-vpn-network-manager-openvpn, - proton-vpn-network-manager-wireguard, - proton-vpn-session, pycairo, pygobject3, withIndicator ? true, @@ -28,14 +21,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.4.4"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM="; + hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro="; }; nativeBuildInputs = [ @@ -60,16 +53,9 @@ buildPythonApplication rec { packaging proton-core proton-keyring-linux - proton-keyring-linux-secretservice proton-vpn-api-core - proton-vpn-connection - proton-vpn-killswitch - proton-vpn-killswitch-network-manager - proton-vpn-logger + proton-vpn-local-agent proton-vpn-network-manager - proton-vpn-network-manager-openvpn - proton-vpn-network-manager-wireguard - proton-vpn-session pycairo pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix index aae05e4cf1..75f7039320 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix @@ -30,25 +30,23 @@ python3.pkgs.buildPythonApplication rec { sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/\1\2/' setup.cfg ''; - dependencies = - with python3.pkgs; - [ - bitmath - certifi - cheroot - cryptography - filetype - flask - flask-babel - flask-caching - flask-compress - flask-session - flask-themes2 - pycurl - semver - setuptools - ] - ++ (if pythonOlder "3.12" then [ js2py ] else [ dukpy ]); + dependencies = with python3.pkgs; [ + bitmath + certifi + cheroot + cryptography + dukpy + filetype + flask + flask-babel + flask-caching + flask-compress + flask-session + flask-themes2 + pycurl + semver + setuptools + ]; optional-dependencies = { plugins = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix index ff301d6909..191a09c422 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix @@ -12,6 +12,7 @@ , systemd , pam , fuse +, libdrm , libjpeg , libopus , nasm @@ -27,18 +28,18 @@ let xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; - version = "0.9.20"; + version = "0.10.2"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - hash = "sha256-cAAWk/GqR5zJmh7EAzX3qJiYNl/RrDWdncdFeqsFIaU="; + hash = "sha256-xwkGY9dD747kyTvoXrYAIoiFBzQe5ngskUYQhDawnbU="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; - buildInputs = [ xorg.xorgserver ]; + buildInputs = [ xorg.xorgserver libdrm ]; postPatch = '' # patch from Debian, allows to run xrdp daemon under unprivileged user @@ -50,9 +51,10 @@ let --replace 'sysconfdir="/etc"' "sysconfdir=$out/etc" ''; - preConfigure = "./bootstrap"; - - configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ]; + preConfigure = '' + ./bootstrap + export XRDP_CFLAGS="-I${xrdp.src}/common -I${libdrm.dev}/include -I${libdrm.dev}/include/libdrm" + ''; enableParallelBuilding = true; @@ -61,7 +63,7 @@ let xrdp = stdenv.mkDerivation rec { pname = "xrdp"; - version = "0.9.25.1"; + version = "0.10.1"; src = applyPatches { inherit version; @@ -72,7 +74,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow="; + hash = "sha256-lqifQJ/JX+0304arVctsEBEDFPhEPn2OWLyjAQW1who="; }; }; @@ -94,7 +96,7 @@ let ]; postPatch = '' - substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" + substituteInPlace sesman/sesexec/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" substituteInPlace configure.ac --replace /usr/include/ "" ''; @@ -128,6 +130,7 @@ let cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse + substituteInPlace $out/etc/xrdp/sesman.ini --replace '#SessionSockdirGroup=root' 'SessionSockdirGroup=xrdp' # remove all session types except Xorg (they are not supported by this setup) perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/dynamic_config.patch b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/dynamic_config.patch index 5c97beeb67..2cb50b19fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/dynamic_config.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/dynamic_config.patch @@ -135,8 +135,8 @@ index 8fa34aea..da94cf95 100644 - LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", keyboard_cfg_file); + LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", client_info->xrdp_keyboard_ini_file); -- fd = g_file_open(keyboard_cfg_file); -+ fd = g_file_open(client_info->xrdp_keyboard_ini_file); +- fd = g_file_open_ro(keyboard_cfg_file); ++ fd = g_file_open_ro(client_info->xrdp_keyboard_ini_file); if (fd >= 0) { @@ -179,19 +179,19 @@ index 8fa34aea..da94cf95 100644 list_delete(items); list_delete(values); return 1; -diff --git a/sesman/config.c b/sesman/config.c +diff --git a/sesman/libsesman/sesman_config.c b/sesman/libsesman/sesman_config.c index 61e9e403..0466f61a 100644 ---- a/sesman/config.c -+++ b/sesman/config.c -@@ -34,6 +34,7 @@ - #include "sesman.h" +--- a/sesman/libsesman/sesman_config.c ++++ b/sesman/libsesman/sesman_config.c +@@ -37,6 +37,7 @@ #include "log.h" + #include "os_calls.h" #include "string_calls.h" +#include - #include "chansrv/chansrv_common.h" - - /***************************************************************************//** -@@ -47,11 +48,10 @@ + //#include "chansrv/chansrv_common.h" + #include "scp.h" + +@@ -171,7 +172,7 @@ config_output_policy_string(unsigned int value, * */ static int @@ -200,61 +200,57 @@ index 61e9e403..0466f61a 100644 struct list *param_v) { int i; -- int length; - char *buf; - - list_clear(param_v); -@@ -127,13 +127,12 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, - g_free(cf->default_wm); +@@ -249,14 +250,12 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, cf->default_wm = g_strdup("startwm.sh"); } -- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ -+ /* if default_wm doesn't begin with '/', it's a relative path to base_dir */ + /* if default_wm doesn't begin with '/', it's a relative path to +- * XRDP_CFG_PATH */ ++ * base_dir */ if (cf->default_wm[0] != '/') { /* sizeof operator returns string length including null terminator */ -- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->default_wm) + 1; /* '/' */ -- buf = (char *)g_malloc(length, 0); +- int length = (sizeof(XRDP_CFG_PATH) + +- g_strlen(cf->default_wm) + 1); /* '/' */ +- char *buf = (char *)g_malloc(length, 0); - g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->default_wm); -+ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->default_wm) + 1, 0); ++ char *buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->default_wm) + 1, 0); + g_sprintf(buf, "%s/%s", base_dir, cf->default_wm); g_free(cf->default_wm); - cf->default_wm = g_strdup(buf); - g_free(buf); -@@ -151,10 +150,8 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, - /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ + cf->default_wm = buf; + } +@@ -271,10 +270,8 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, if (cf->reconnect_sh[0] != '/') { -- /* sizeof operator returns string length including null terminator */ -- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->reconnect_sh) + 1; /* '/' */ -- buf = (char *)g_malloc(length, 0); + /* sizeof operator returns string length including null terminator */ +- int length = (sizeof(XRDP_CFG_PATH) + +- g_strlen(cf->reconnect_sh) + 1); /* '/' */ +- char *buf = (char *)g_malloc(length, 0); - g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->reconnect_sh); -+ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->reconnect_sh) + 1, 0); -+ g_sprintf(buf, "%s/%s", base_dir, cf->reconnect_sh); ++ char *buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->reconnect_sh) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->reconnect_sh); g_free(cf->reconnect_sh); - cf->reconnect_sh = g_strdup(buf); - g_free(buf); -@@ -511,6 +508,7 @@ struct config_sesman * + cf->reconnect_sh = buf; + } +@@ -580,6 +577,7 @@ struct config_sesman * config_read(const char *sesman_ini) { struct config_sesman *cfg; + char cfg_dir[256]; int all_ok = 0; - + if ((cfg = g_new0(struct config_sesman, 1)) != NULL) -@@ -532,8 +530,10 @@ config_read(const char *sesman_ini) - param_v->auto_free = 1; - +@@ -602,7 +600,10 @@ config_read(const char *sesman_ini) + all_ok = 1; + /* read global config */ - config_read_globals(fd, cfg, param_n, param_v); -- + g_strcpy(cfg_dir, sesman_ini); + *(strrchr(cfg_dir, '/')) = 0; // cfg_file validated to contain '/' -+ ++ + config_read_globals(cfg_dir, fd, cfg, param_n, param_v); - /* read Xvnc/X11rdp/Xorg parameter list */ + + /* read Xvnc/Xorg parameter list */ config_read_vnc_params(fd, cfg, param_n, param_v); - config_read_rdp_params(fd, cfg, param_n, param_v); diff --git a/xrdp/lang.c b/xrdp/lang.c index e4c18077..06f92997 100644 --- a/xrdp/lang.c diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix index f166158254..1e841d1032 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "--enable-unicode" "--enable-ipv6" "--enable-eep" + "--with-openssl" ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix index 0790cb44d1..cd9335f1d9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-sQ3dxwPWHLUoWgnR9+oHaFoDzXxtwKRiBvz2wkFB01g="; + hash = "sha256-fn1UK8+7+vFL4nTnnRbfjCgttVYSw6pmmqabeHqTY3g="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-4bU/qecZBrTr34SZAjDDgwpXAAHDITz6lV6mJGjElko="; + hash = "sha256-MoK6GlGmRVRp6feH8hab4CYpP4bXJN3XH7eHHSnhpS4="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.8"; + version = "0.7.1"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix deleted file mode 100644 index abeb83c927..0000000000 --- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, avahi -, cups -, gnutls -, libjpeg -, libpng -, libusb1 -, pkg-config -, withPAMSupport ? true, pam -, zlib -}: - -stdenv.mkDerivation rec { - pname = "pappl"; - version = "1.4.6"; - - src = fetchFromGitHub { - owner = "michaelrsweet"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-d7QD6Kz4tBVHGFPBYcvRSzW+EtsNgpfweFvCx3ovfWE="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - cups - libjpeg - libpng - libusb1 - zlib - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # upstream mentions these are not needed for Mac - # see: https://github.com/michaelrsweet/pappl#requirements - avahi - gnutls - ] ++ lib.optionals withPAMSupport [ - pam - ]; - - # testing requires some networking - # doCheck = true; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/pappl-makeresheader --help - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C-based framework/library for developing CUPS Printer Applications"; - mainProgram = "pappl-makeresheader"; - homepage = "https://github.com/michaelrsweet/pappl"; - license = licenses.asl20; - platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix index 7e67de1301..e591c98f30 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.24"; + version = "2.0.25"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "sha256-jUU6xt3H9bY9CAQRTFQjprlsC77VwjIB/6sSRNzE+Lw="; + sha256 = "sha256-NYC3LgoLXnJQURcZTc2xHOzOleotrWtOETMBgadf2qU="; }; # glib-2.62 deprecations diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix index f3afff0f5e..314cbd56b6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-cTg9TEpz3FSgX2tpfU4y55cCgFY5+mQY86FziHAwd+s="; + sha256 = "sha256-rNwoHb2jbQwL1bnP5KsI/SsHNN9EeXzsGnMpFhXrc1o="; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index 9057e767c1..ea5d7125c7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1550"; + version = "1592"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-kvI3m2FIPscU/a3GEH+O3yx5TgdNHdYP6OW3/mI2roM="; + hash = "sha256-ZZdIOUKyA+TvWHOV5JU1LUnh3hSDBqXhJK9a/frVMF0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix index fb24f903f5..d3d349969b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; - nativeCheckInputs = [ mpiCheckPhaseHook ]; + nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; installCheckPhase = '' runHook preInstallCheck @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source High-Performance Computational Chemistry"; mainProgram = "nwchem"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ sheepforce markuskowa ]; homepage = "https://nwchemgit.github.io"; license = licenses.ecl20; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix index 576a92625d..eb4c835353 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.12"; + version = "4.13"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-vVpmf/ykv3641RE0Awzj3zsW3Z0OgA+v2xzoNYZ2QNk="; + sha256 = "sha256-862s0GO56mDV6cN8YYP127dFiwyzSR66Pvw48gxWXOs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix index b6f8a0d6f1..a8f2b65b66 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix @@ -187,10 +187,10 @@ let in stdenv.mkDerivation rec { pname = "crystfel"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://www.desy.de/~twhite/crystfel/crystfel-${version}.tar.gz"; - sha256 = "sha256-ogNHWYfbxRmB5TdK8K0JpcCnYOOyXapQGSPh8mfp+Tc="; + sha256 = "sha256-vZuN9dYnowySC/OX0EZB0mbhoBOyRiOWfX9d6sl1lKQ="; }; nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] ++ lib.optionals withGui [ wrapGAppsHook3 ]; @@ -220,9 +220,6 @@ stdenv.mkDerivation rec { # on darwin at least, we need to link to a separate argp library; # this patch adds a test for this and the necessary linker options ./link-to-argp-standalone-if-needed.patch - # hotfix for an issue that occurs (at least) on NixOS: - # if the temporary path is too long, we get a segfault - ./gui-path-issue.patch ]; # CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch deleted file mode 100644 index 28cd0280e8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/gui_index.c b/src/gui_index.c -index 2cc8e8db..13be77d5 100644 ---- a/src/gui_index.c -+++ b/src/gui_index.c -@@ -540,6 +540,7 @@ static void delete_gui_tempdir(char *tmpdir) - { - char *path; - int i; -+ size_t pathlen; - - /* List of files which it's safe to delete */ - char *files[] = {"gmon.out", "mosflm.lp", "SUMMARY", "XDS.INP", -@@ -552,11 +553,12 @@ static void delete_gui_tempdir(char *tmpdir) - - if ( tmpdir == NULL ) return; - -- path = calloc(strlen(tmpdir)+64, 1); -+ pathlen = strlen(tmpdir)+64; -+ path = calloc(pathlen, 1); - if ( path == NULL ) return; - - for ( i=0; i/dev/null' 'command type -P wezterm &>/dev/null' \ + --replace-fail 'hash base64 2>/dev/null' 'command type -P base64 &>/dev/null' \ + --replace-fail 'hash hostname 2>/dev/null' 'command type -P hostname &>/dev/null' \ + --replace-fail 'hash hostnamectl 2>/dev/null' 'command type -P hostnamectl &>/dev/null' ''; cargoLock = { @@ -123,18 +130,40 @@ rustPlatform.buildRustPackage rec { ''; passthru = { + # the headless variant is useful when deploying wezterm's mux server on remote severs + headless = rustPlatform.buildRustPackage { + pname = "${pname}-headless"; + inherit version src postPatch cargoLock meta; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + cargoBuildFlags = [ + "--package" "wezterm" + "--package" "wezterm-mux-server" + ]; + + doCheck = false; + + postInstall = '' + install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d + install -Dm644 ${passthru.terminfo}/share/terminfo/w/wezterm -t $out/share/terminfo/w + ''; + }; + + terminfo = runCommand "wezterm-terminfo" { + nativeBuildInputs = [ ncurses ]; + } '' + mkdir -p $out/share/terminfo $out/nix-support + tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo + ''; + tests = { all-terminfo = nixosTests.allTerminfo; # the test is commented out in nixos/tests/terminal-emulators.nix #terminal-emulators = nixosTests.terminal-emulators.wezterm; }; - terminfo = runCommand "wezterm-terminfo" - { - nativeBuildInputs = [ ncurses ]; - } '' - mkdir -p $out/share/terminfo $out/nix-support - tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo - ''; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix index 0e83d17d33..b5dac88164 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - hash = "sha256-4RRSffkAe0/8k4SNnlB1iiaW4gWFTuYXplVBj2aRIdU="; + hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U="; }; - cargoHash = "sha256-Jg4d7tJXr2O1sEDdB/zk+7TPBZvgHlmW8mNiXozLKV8="; + cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8="; nativeBuildInputs = [ pkg-config ]; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - postInstall = '' + postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) '' $out/bin/git-branchless install-man-pages $out/share/man ''; @@ -48,8 +48,15 @@ rustPlatform.buildRustPackage rec { export TEST_GIT=${git}/bin/git export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path) ''; - # FIXME: these tests deadlock when run in the Nix sandbox + + # Note that upstream has disabled CI tests for git>=2.46 + # See: https://github.com/arxanas/git-branchless/issues/1416 + # https://github.com/arxanas/git-branchless/pull/1417 + # To be re-enabled once arxanas/git-branchless#1416 is resolved + doCheck = false; + checkFlags = [ + # FIXME: these tests deadlock when run in the Nix sandbox "--skip=test_switch_pty" "--skip=test_next_ambiguous_interactive" "--skip=test_switch_auto_switch_interactive" @@ -63,6 +70,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ nh2 hmenke + bryango ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix index 2e10c633b0..53382b2c24 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-Zzk133ZJv91zbFz0U9tiv8pb0pAIBt9Y/8PYIaABMGc="; + sha256 = "sha256-0XZwEhDjh+rL6ZEWb60+GUw7hFOS3Xr32hgPNJcOL9I="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix index dfdcacc3b3..d33f1d2760 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix @@ -17,6 +17,8 @@ , vala , cmake , libmicrodns +, gtuber +, glib-networking }: stdenv.mkDerivation (finalAttrs: { @@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gtuber + glib-networking # for TLS support gtk4 libGL libadwaita diff --git a/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix b/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix index 02a4a66be9..452980565a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix @@ -1,26 +1,27 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, makeWrapper -, gnugrep -, gnused -, curl -, mpv -, aria2 -, ffmpeg -, fzf -, openssl +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + gnugrep, + gnused, + curl, + mpv, + aria2, + ffmpeg, + fzf, + openssl, }: stdenvNoCC.mkDerivation { pname = "dra-cla"; - version = "unstable-2024-02-07"; + version = "0-unstable-2024-06-07"; src = fetchFromGitHub { owner = "CoolnsX"; repo = "dra-cla"; - rev = "cf8a90c0c68338404e8a1434af0a6e65fc5d0a08"; - hash = "sha256-3cz1VeDM0NHdYMiCDVnIq6Y/7rFSijhNrnxC36Yixxc="; + rev = "24d7eaa5d433bc2cbbba4f23552cd812506fefee"; + hash = "sha256-BmBQSkLSq+BaxkzXEy3hlI3qNq2NCIoGKDKt7gyDz+s="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +32,18 @@ stdenvNoCC.mkDerivation { install -Dm755 dra-cla $out/bin/dra-cla wrapProgram $out/bin/dra-cla \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg fzf openssl ]} + --prefix PATH : ${ + lib.makeBinPath [ + gnugrep + gnused + curl + mpv + aria2 + ffmpeg + fzf + openssl + ] + } runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix index 39904f8291..66e670d053 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Open source video mapping software"; homepage = "https://github.com/mapmapteam/mapmap"; license = licenses.gpl3; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "mapmap"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 520bcb3bb8..4ca4f675bb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -73,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + separateDebugInfo = true; + patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix index 5a29921b93..c2e718b233 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, obs-studio, cmake, qtbase }: +{ lib, stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, fetchpatch }: stdenv.mkDerivation rec { pname = "obs-multi-rtmp"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4="; }; + patches = [ + # Fix finding QT. Remove after next release. + (fetchpatch { + url = "https://github.com/sorayuki/obs-multi-rtmp/commit/a1289fdef404b08a7acbbf0d6d0f93da4c9fc087.patch"; + hash = "sha256-PDkR315y0iem1+LAqGmiqBFUiMBeEgnFW/xd1W2bAu4="; + includes = [ "CMakeLists.txt" ]; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index 23cc300d7f..0d91a79aff 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-source-record"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-source-record"; rev = version; - sha256 = "sha256-VgG9Fn75aKTkth4TC9rhfj/HIOO2lIO4n3ZYmemkzx8="; + sha256 = "sha256-RodZjab3DKiJwYuspdpCsF0ah4u5JtDDYoZPUGk36H4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 3b9dcf0bfa..ad2a338ba8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.22"; + version = "1.7.23"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; + hash = "sha256-vuOefU1cZr1pKCYHKyDBx/ohghgPlXhK3a38PQKH0pc="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index c36ed73617..10168a6d75 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit +{ lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , pkgsCross @@ -6,18 +6,27 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "128.1"; + version = "129.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "57702acf01cbd0e560e058dc97d22378d0c49ecc"; - hash = "sha256-lQStmmTxMC9Iq6vJxJMFIUUtaixJNGuBfAvBo9KKrjU="; + rev = "b7fd753b43baf2da422a1fe5e2c6d05180f7cd0b"; + hash = "sha256-y1PlqX6ghCet2SdtS/M2rXy58mHyHMLOxy3OrcoHSJk="; fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "cross-domain.patch"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/60053cdf0b360a03084292b39120365fff65d410%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-U5eOxuAtVLjJ+8h16lmbJYNxsP/AOEv/1ec4WlUxP2E="; + }) + ]; + separateDebugInfo = true; - cargoHash = "sha256-qKCO9Rkk04HznExgYKJgpssZDjWfhsY2XOBifvtHFos="; + cargoHash = "sha256-zQ2Y0/xjnHN75nX0Awigrh9Cnuh8N47XwDhq+ZLITDg="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py index 62e195d342..92444d2874 100755 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -p common-updater-scripts python3 +#! nix-shell -p common-updater-scripts nix-update python3 #! nix-shell -i python import csv @@ -52,3 +52,6 @@ with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log # Update the version, git revision, and hash in crosvm's default.nix. subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version]) + +# Update cargoHash. +subprocess.run(['nix-update', '--version=skip', 'crosvm']) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix index ce7d993d39..947def308f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix @@ -1,79 +1,69 @@ { lib , stdenv , fetchFromGitHub -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs , makeWrapper , copyDesktopItems -, desktopToDarwinBundle , electron +, nodejs +, pnpm , makeDesktopItem +, autoSignDarwinBinariesHook +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "0.12.0"; + version = "1.13.2"; + + passthru.updateScript = nix-update-script { }; src = fetchFromGitHub { owner = "containers"; repo = "podman-desktop"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-gEjcI+bfETYZB/pHDXRcNxNVDsbwuqQL1E22fMkIJHI="; + sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8="; }; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - sha256 = "sha256-x0hqNxi6r1i3vBe1tJQl+Oht2St9VIH3Eq27MZLkojA="; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA="; }; patches = [ # podman should be installed with nix; disable auto-installation ./patches/extension-no-download-podman.patch - ./patches/fix-yarn-lock-deterministic.patch ]; postPatch = '' - for file in packages/main/src/tray-animate-icon.ts extensions/podman/src/util.ts packages/main/src/plugin/certificates.ts; do + for file in packages/main/src/tray-animate-icon.ts packages/main/src/plugin/certificates.ts; do substituteInPlace "$file" \ - --replace 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'" \ - --replace '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'" + --replace-fail 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'" done + substituteInPlace "extensions/podman/packages/extension/src/util.ts" \ + --replace-fail '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'" ''; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ - yarn - fixup-yarn-lock - nodejs - makeWrapper + makeWrapper nodejs pnpm.configHook + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - desktopToDarwinBundle + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + autoSignDarwinBinariesHook ]; - configurePhase = '' - runHook preConfigure - - export HOME="$TMPDIR" - yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - yarn --offline run build - yarn --offline run electron-builder --dir \ + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + pnpm build + ./node_modules/.bin/electron-builder \ + --dir \ --config .electron-builder.config.cjs \ - -c.electronDist=${electron.dist} \ + -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} runHook postBuild @@ -83,6 +73,13 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$out/share/lib/podman-desktop" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv dist/mac*/Podman\ Desktop.app $out/Applications + ln -s $out/Applications/Podman\ Desktop.app/Contents/Resources "$out/share/lib/podman-desktop/resources" + + makeWrapper "$out/Applications/Podman Desktop.app/Contents/MacOS/Podman Desktop" $out/bin/podman-desktop + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop" install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg" @@ -91,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 + '' + '' runHook postInstall ''; @@ -109,12 +107,12 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = with lib; { + meta = { description = "A graphical tool for developing on containers and Kubernetes"; homepage = "https://podman-desktop.io"; changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; - license = licenses.asl20; - maintainers = with maintainers; [ panda2134 ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ booxter panda2134 ]; inherit (electron.meta) platforms; mainProgram = "podman-desktop"; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch index 89633b5729..0fd41fa221 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch @@ -1,13 +1,24 @@ -diff --git a/extensions/podman/package.json b/extensions/podman/package.json -index 5f86bbe9..92c0ef3b 100644 ---- a/extensions/podman/package.json -+++ b/extensions/podman/package.json -@@ -86,7 +86,7 @@ +From f6dfc258742d03bd0270e9fded925ffa75cc60b0 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Sat, 21 Sep 2024 18:56:02 -0400 +Subject: [PATCH] Don't download podman + +--- + extensions/podman/packages/extension/package.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extensions/podman/packages/extension/package.json b/extensions/podman/packages/extension/package.json +index 1824d817f1..d1cc9a5dbf 100644 +--- a/extensions/podman/packages/extension/package.json ++++ b/extensions/podman/packages/extension/package.json +@@ -369,7 +369,7 @@ } }, "scripts": { -- "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && npx ts-node ./scripts/download.ts && node ./scripts/build.js", -+ "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && node ./scripts/build.js", - "watch": "rollup --bundleConfigAsCjs --config rollup.config.js -w", - "test": "vitest run --passWithNoTests" - }, +- "build": "vite build && tsx ./scripts/download.ts && node ./scripts/build.cjs", ++ "build": "vite build && node ./scripts/build.cjs", + "test": "vitest run --coverage --passWithNoTests", + "test:watch": "vitest watch --coverage --passWithNoTests", + "watch": "vite build -w" +-- +2.46.0 diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch deleted file mode 100644 index 5b69f5e4e7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock -index ae340d04..5acc3fed 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -12753,7 +12753,7 @@ ws@^7.3.1: - resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== - --ws@^8.11.0, ws@^8.4.2: -+ws@^8.11.0, ws@^8.12.0, ws@^8.4.2: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index c5f1191605..396b10250e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -75,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ="; + hash = "sha256-fcD52lSR/0SVAPMxAGOja2GfI27kVwb9CEbrN9S7qIk="; }; depsBuildBuild = [ buildPlatformStdenv.cc ] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix index 3d553acd48..05c5268b08 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virt-what"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-qoap0xO1yQSK+a2aA4fkr/I4uw6kLzuDARTotQzTFTU="; + sha256 = "sha256-1Nm9nUrlkJVZdEP6xmNJUxXH60MwuHKqXwYt84rGm/E="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 437ceba29c..13d254699f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,25 +1,74 @@ -{ config, stdenv, fetchurl, fetchpatch, callPackage, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook -, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU -, libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras -, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz -, yasm, glslang -, nixosTests -# If open-watcom-bin is not passed, VirtualBox will fall back to use -# the shipped alternative sources (assembly). -, open-watcom-bin -, makeself, perl -, vulkan-loader -, javaBindings ? true, jdk # Almost doesn't affect closure size -, pythonBindings ? false, python3 -, extensionPack ? null, fakeroot -, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio -, enableHardening ? false -, headless ? false -, enable32bitGuests ? true -, enableWebService ? false -, enableKvm ? false -, extraConfigureFlags ? "" +{ + config, + stdenv, + fetchurl, + fetchpatch, + callPackage, + lib, + acpica-tools, + dev86, + pam, + libxslt, + libxml2, + wrapQtAppsHook, + libX11, + xorgproto, + libXext, + libXcursor, + libXmu, + libIDL, + SDL2, + libcap, + libGL, + libGLU, + libpng, + glib, + lvm2, + libXrandr, + libXinerama, + libopus, + libtpms, + qtbase, + qtx11extras, + qttools, + qtsvg, + qtwayland, + pkg-config, + which, + docbook_xsl, + docbook_xml_dtd_43, + alsa-lib, + curl, + libvpx, + nettools, + dbus, + substituteAll, + gsoap, + zlib, + xz, + yasm, + glslang, + nixosTests, + # If open-watcom-bin is not passed, VirtualBox will fall back to use + # the shipped alternative sources (assembly). + open-watcom-bin, + makeself, + perl, + vulkan-loader, + javaBindings ? true, + jdk, # Almost doesn't affect closure size + pythonBindings ? false, + python3, + extensionPack ? null, + fakeroot, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + libpulseaudio, + enableHardening ? false, + headless ? false, + enable32bitGuests ? true, + enableWebService ? false, + enableKvm ? false, + extraConfigureFlags ? "", }: # The web services use Java infrastructure. @@ -41,12 +90,26 @@ let virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; - inherit (lib) optional optionals optionalString getDev getLib; -in stdenv.mkDerivation (finalAttrs: { + inherit (lib) + optional + optionals + optionalString + getDev + getLib + ; +in +stdenv.mkDerivation (finalAttrs: { pname = "virtualbox"; version = finalAttrs.virtualboxVersion; - inherit buildType virtualboxVersion virtualboxSha256 kvmPatchVersion kvmPatchHash virtualboxGuestAdditionsIso; + inherit + buildType + virtualboxVersion + virtualboxSha256 + kvmPatchVersion + kvmPatchHash + virtualboxGuestAdditionsIso + ; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2"; @@ -55,39 +118,84 @@ in stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] ++ optional withModsrc "modsrc"; - nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 yasm glslang ] - ++ optional (!headless) wrapQtAppsHook; + nativeBuildInputs = [ + pkg-config + which + docbook_xsl + docbook_xml_dtd_43 + yasm + glslang + ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; - buildInputs = [ - acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libXrandr libpng libopus libtpms python3 xz ] + buildInputs = + [ + acpica-tools + dev86 + libxslt + libxml2 + xorgproto + libX11 + libXext + libXcursor + libIDL + libcap + glib + lvm2 + alsa-lib + curl + libvpx + pam + makeself + perl + libXmu + libXrandr + libpng + libopus + libtpms + python3 + xz + ] ++ optional javaBindings jdk ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals headless [ libGL ] - ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL2 libGLU ] - ++ optionals enableWebService [ gsoap zlib ]; + ++ optionals (!headless) [ + qtbase + qtx11extras + libXinerama + SDL2 + libGLU + ] + ++ optionals enableWebService [ + gsoap + zlib + ]; - hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; + hardeningDisable = [ + "format" + "fortify" + "pic" + "stackprotector" + ]; prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ - ${optionalString (!headless) '' - -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ - ''} -i configure + ${ + optionalString (!headless) '' + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ + '' + } -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' - ${optionalString pulseSupport - ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' + ${optionalString pulseSupport ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' @@ -100,39 +208,41 @@ in stdenv.mkDerivation (finalAttrs: { ''; patches = - optional enableHardening ./hardened.patch - # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 - ++ optionals (!headless) [ ./fix-sdl.patch - # No update patch disables check for update function - # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 - (fetchpatch { - url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; - hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; - })] - ++ [ ./extra_symbols.patch ] - # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees - # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. - # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, - # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around - # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, - # after the code that unsets it. Note that qtsvg is included so that SVG icons from - # the user's icon theme can be loaded. - ++ optional (!headless && enableHardening) (substituteAll { + optional enableHardening ./hardened.patch + # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 + ++ optionals (!headless) [ + ./fix-sdl.patch + # No update patch disables check for update function + # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 + (fetchpatch { + url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; + hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; + }) + ] + ++ [ ./extra_symbols.patch ] + # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees + # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. + # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, + # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around + # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, + # after the code that unsets it. Note that qtsvg is included so that SVG icons from + # the user's icon theme can be loaded. + ++ optional (!headless && enableHardening) (substituteAll { src = ./qt-env-vars.patch; qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; - }) - # While the KVM patch should not break any other behavior if --with-kvm is not specified, - # we don't take any chances and only apply it if people actually want to use KVM support. - ++ optional enableKvm (fetchpatch { + }) + # While the KVM patch should not break any other behavior if --with-kvm is not specified, + # we don't take any chances and only apply it if people actually want to use KVM support. + ++ optional enableKvm (fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; hash = finalAttrs.kvmPatchHash; }) - ++ [ - ./qt-dependency-paths.patch - # https://github.com/NixOS/nixpkgs/issues/123851 - ./fix-audio-driver-loading.patch - ]; + ++ [ + ./qt-dependency-paths.patch + # https://github.com/NixOS/nixpkgs/issues/123851 + ./fix-audio-driver-loading.patch + ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -161,18 +271,18 @@ in stdenv.mkDerivation (finalAttrs: { VBOX_WITH_UPDATE_AGENT := ${optionalString javaBindings '' - VBOX_JAVA_HOME := ${jdk} + VBOX_JAVA_HOME := ${jdk} ''} ${optionalString (!headless) '' - VBOX_WITH_VBOXSDL := 1 - PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib - PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include - PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib - PATH_QT5_TOOLS_INC := ${getDev qttools}/include + VBOX_WITH_VBOXSDL := 1 + PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include + PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib + PATH_QT5_TOOLS_INC := ${getDev qttools}/include ''} ${optionalString enableWebService '' - # fix gsoap missing zlib include and produce errors with --as-needed - VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + # fix gsoap missing zlib include and produce errors with --as-needed + VBOX_GSOAP_CXX_LIBS := gsoapssl++ z ''} TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease LOCAL_CONFIG @@ -213,7 +323,9 @@ in stdenv.mkDerivation (finalAttrs: { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${ + optionalString (!headless) "VirtualBox VBoxSDL" + } ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file @@ -255,15 +367,16 @@ in stdenv.mkDerivation (finalAttrs: { ln -s "${finalAttrs.virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; - preFixup = optionalString (!headless) '' - wrapQtApp $out/bin/VirtualBox - '' - # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching - # the source code (see postPatch). - + optionalString (!headless && !enableHardening) '' - wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" - ''; + preFixup = + optionalString (!headless) '' + wrapQtApp $out/bin/VirtualBox + '' + # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching + # the source code (see postPatch). + + optionalString (!headless && !enableHardening) '' + wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" + ''; passthru = { inherit extensionPack; # for inclusion in profile to prevent gc @@ -285,7 +398,11 @@ in stdenv.mkDerivation (finalAttrs: { ]; license = lib.licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with lib.maintainers; [ sander friedrichaltheide blitz ]; + maintainers = with lib.maintainers; [ + sander + friedrichaltheide + blitz + ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 365c635a17..524077cd02 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,4 +1,8 @@ -{ fetchurl, lib, virtualbox }: +{ + fetchurl, + lib, + virtualbox, +}: let inherit (virtualbox) version; in @@ -9,14 +13,20 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; - in assert (builtins.stringLength value) == 64; value; + let + value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; + in + assert (builtins.stringLength value) == 64; + value; meta = with lib; { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander friedrichaltheide ]; + maintainers = with maintainers; [ + sander + friedrichaltheide + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index f59dcc25f4..9eda8a64da 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,4 +1,8 @@ -{ fetchurl, lib, virtualbox}: +{ + fetchurl, + lib, + virtualbox, +}: let inherit (virtualbox) version; @@ -13,7 +17,13 @@ fetchurl { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ + lib.maintainers.sander + lib.maintainers.friedrichaltheide + ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 00d0d555c6..f2571d11fe 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,14 +1,32 @@ -{ stdenv, kernel, fetchurl, lib, pam, libxslt -, libXext, libXcursor, libXmu -, glib, libXrandr, dbus, xz -, pkg-config, which, xorg -, yasm, patchelf, makeself -, linuxHeaders, openssl}: +{ + stdenv, + kernel, + fetchurl, + lib, + pam, + libxslt, + libXext, + libXcursor, + libXmu, + glib, + libXrandr, + dbus, + xz, + pkg-config, + which, + xorg, + yasm, + patchelf, + makeself, + linuxHeaders, + openssl, +}: let buildType = "release"; -in stdenv.mkDerivation (finalAttrs: { +in +stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; version = "7.0.20"; @@ -19,8 +37,26 @@ in stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf pkg-config which yasm makeself xorg.xorgserver openssl linuxHeaders xz ] ++ kernel.moduleBuildDependencies; - buildInputs = [ dbus libxslt libXext libXcursor pam libXmu libXrandr ]; + nativeBuildInputs = [ + patchelf + pkg-config + which + yasm + makeself + xorg.xorgserver + openssl + linuxHeaders + xz + ] ++ kernel.moduleBuildDependencies; + buildInputs = [ + dbus + libxslt + libXext + libXcursor + pam + libXmu + libXrandr + ]; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; @@ -58,61 +94,61 @@ in stdenv.mkDerivation (finalAttrs: { ''; configurePhase = '' - NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') + NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') - cat >> LocalConfig.kmk <> LocalConfig.kmk < + + + + + + + + + diff --git a/third_party/nixpkgs/pkgs/build-support/substitute/substitute-all.nix b/third_party/nixpkgs/pkgs/build-support/substitute/substitute-all.nix index f49d56041f..c6fc688d50 100644 --- a/third_party/nixpkgs/pkgs/build-support/substitute/substitute-all.nix +++ b/third_party/nixpkgs/pkgs/build-support/substitute/substitute-all.nix @@ -1,12 +1,22 @@ -{ stdenvNoCC }: - -args: - +{ lib, stdenvNoCC }: # see the substituteAll in the nixpkgs documentation for usage and constraints -stdenvNoCC.mkDerivation ({ - name = if args ? name then args.name else baseNameOf (toString args.src); - builder = ./substitute-all.sh; - inherit (args) src; - preferLocalBuild = true; - allowSubstitutes = false; -} // args) +args: +let + # keep this in sync with substituteAll + isInvalidArgName = x: builtins.match "^[a-z][a-zA-Z0-9_]*$" x == null; + invalidArgs = builtins.filter isInvalidArgName (builtins.attrNames args); +in + if invalidArgs == [] then + stdenvNoCC.mkDerivation ({ + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = ./substitute-all.sh; + inherit (args) src; + preferLocalBuild = true; + allowSubstitutes = false; + } // args) + else throw '' + Argument names for `pkgs.substituteAll` must: + - start with a lower case ASCII letter + - only contain ASCII letters, digits and underscores + Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}. + '' diff --git a/third_party/nixpkgs/pkgs/build-support/xen/default.nix b/third_party/nixpkgs/pkgs/build-support/xen/default.nix index 6dc8e38d92..9964f0386f 100644 --- a/third_party/nixpkgs/pkgs/build-support/xen/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/xen/default.nix @@ -30,7 +30,8 @@ zstd, # Optional Components - seabios, + seabios-qemu, + systemSeaBIOS ? seabios-qemu, OVMF, ipxe, checkpolicy, @@ -261,7 +262,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-systemd" "--disable-qemu-traditional" "--with-system-qemu" - (if withSeaBIOS then "--with-system-seabios=${seabios}/share/seabios" else "--disable-seabios") + (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios") (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf") (if withIPXE then "--with-system-ipxe=${ipxe}" else "--disable-ipxe") (enableFeature withFlask "xsmpolicy") diff --git a/third_party/nixpkgs/pkgs/by-name/al/albedo/package.nix b/third_party/nixpkgs/pkgs/by-name/al/albedo/package.nix new file mode 100644 index 0000000000..7b63f9e704 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/albedo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "albedo"; + version = "0.0.16"; + + src = fetchFromGitHub { + owner = "coreruleset"; + repo = "albedo"; + rev = "refs/tags/v${version}"; + hash = "sha256-HMW0SIcPDCy2QNfxpMke+/d1XCNpyx6RL6RCZAmU+WE="; + }; + + vendorHash = "sha256-3YBcu/GEonEoORbB7x6YGpIl7kEzUQ9PAZNFB8NKb+c="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "HTTP reflector and black hole"; + homepage = "https://github.com/coreruleset/albedo"; + changelog = "https://github.com/coreruleset/albedo/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "albedo"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix b/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix index 4d79821f67..6d1806f65d 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.28.4"; + version = "1.28.5"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-ihfTVVc6kM+rOyPG7k2rkLVmCsOlBA7Uik8KrWhrdp0="; + hash = "sha256-N+0bNgD80LLzwRAvYwxcLC0WnMgpvS4DnX/dZx0nIvE="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/al/alioth/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alioth/package.nix new file mode 100644 index 0000000000..02bb4f3992 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/alioth/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "alioth"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "alioth"; + rev = "refs/tags/v${version}"; + hash = "sha256-K0Hx6EJYyPJZA+FLIj44BtUuZZOqWW2DUJt1QbeZyu0="; + }; + + # Checks use `debug_assert_eq!` + checkType = "debug"; + + cargoHash = "sha256-J+1SXHQJJxT0qN/ELAvwQFnKCo13ZrQClpbfleM4PkA="; + + separateDebugInfo = true; + + meta = with lib; { + homepage = "https://github.com/google/alioth"; + description = "Experimental Type-2 Hypervisor in Rust implemented from scratch"; + license = licenses.asl20; + mainProgram = "alioth"; + maintainers = with maintainers; [ astro ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix index e34bebff8f..424df24274 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix @@ -36,6 +36,8 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs="; }) ./match-wrappers.patch + # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/27 + ./reliable-mounts-file.patch ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch b/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch new file mode 100644 index 0000000000..9daccc3d94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch @@ -0,0 +1,13 @@ +diff --git a/src/platform/linux/cgroups.cpp b/src/platform/linux/cgroups.cpp +index 766fd2f5247ce64eb7dfd45e5551f41773eaa18b..d27dbf724bdf5097dfda0c8d4eaaadb3e81f70b3 100644 +--- a/src/platform/linux/cgroups.cpp ++++ b/src/platform/linux/cgroups.cpp +@@ -223,7 +223,7 @@ control_groups::cgroup_info control_groups::get_cgroup_version(bool reset) { + } + + if (!info.has_value()) { +- std::ifstream mtab("/etc/mtab"); ++ std::ifstream mtab("/proc/self/mounts"); + while (mtab) { + std::string word, line; + fs::path cgroup_path; diff --git a/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix index 78165b6b12..c2abce6415 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/coral-xyz/anchor"; changelog = "https://github.com/coral-xyz/anchor/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = [ ]; mainProgram = "anchor"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/an/ani-skip/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ani-skip/package.nix new file mode 100644 index 0000000000..6302ec58ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/an/ani-skip/package.nix @@ -0,0 +1,55 @@ +{ + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + gnugrep, + gnused, + curl, + fzf, + lib, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ani-skip"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "synacktraa"; + repo = "ani-skip"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-VEEG3d6rwTAS7/+gBKHFKIg9zFfBu5eBOu6Z23621gM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + runtimeInputs = [ + gnugrep + gnused + curl + fzf + ]; + + installPhase = '' + runHook preInstall + + install -D skip.lua $out/share/mpv/scripts/skip.lua + install -Dm 755 ani-skip $out/bin/ani-skip + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/bin/ani-skip \ + --replace-fail '--script-opts=%s' "--script=$out/share/mpv/scripts/skip.lua --script-opts=%s" + + wrapProgram $out/bin/ani-skip \ + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs} + ''; + + meta = { + homepage = "https://github.com/synacktraa/ani-skip"; + description = "Automated solution to bypassing anime opening and ending sequences"; + mainProgram = "ani-skip"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.diniamo ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/an/antares/npm-lock.patch b/third_party/nixpkgs/pkgs/by-name/an/antares/npm-lock.patch index 71b75e3958..48ef846cb9 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/antares/npm-lock.patch +++ b/third_party/nixpkgs/pkgs/by-name/an/antares/npm-lock.patch @@ -1,17 +1,17 @@ diff --git a/package-lock.json b/package-lock.json -index a38125e..a1067b0 100644 +index 90dda57..ef0ab55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "antares", - "version": "0.7.28", + "version": "0.7.29", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { -@@ -107,116 +107,55 @@ +@@ -107,116 +107,59 @@ "xvfb-maybe": "~0.2.1" } }, @@ -25,10 +25,10 @@ index a38125e..a1067b0 100644 - }, "node_modules/@ampproject/remapping": { - "version": "2.2.1", -- "license": "Apache-2.0", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "license": "Apache-2.0", "peer": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", @@ -42,14 +42,14 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/code-frame": { - "version": "7.23.4", -- "license": "MIT", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", -+ "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", ++ "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.23.4", - "chalk": "^2.4.2" -+ "@babel/highlight": "^7.24.7", ++ "@babel/highlight": "^7.25.7", + "picocolors": "^1.0.0" }, "engines": { @@ -115,20 +115,20 @@ index a38125e..a1067b0 100644 - }, "node_modules/@babel/compat-data": { - "version": "7.23.3", -- "license": "MIT", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", -+ "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", ++ "version": "7.25.8", ++ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz", ++ "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.3", -- "license": "MIT", -+ "version": "7.25.2", -+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", -+ "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", ++ "version": "7.25.8", ++ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", ++ "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==", + "license": "MIT", "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -141,61 +141,60 @@ index a38125e..a1067b0 100644 - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.3", - "@babel/types": "^7.23.3", -+ "@babel/code-frame": "^7.24.7", -+ "@babel/generator": "^7.25.0", -+ "@babel/helper-compilation-targets": "^7.25.2", -+ "@babel/helper-module-transforms": "^7.25.2", -+ "@babel/helpers": "^7.25.0", -+ "@babel/parser": "^7.25.0", -+ "@babel/template": "^7.25.0", -+ "@babel/traverse": "^7.25.2", -+ "@babel/types": "^7.25.2", ++ "@babel/code-frame": "^7.25.7", ++ "@babel/generator": "^7.25.7", ++ "@babel/helper-compilation-targets": "^7.25.7", ++ "@babel/helper-module-transforms": "^7.25.7", ++ "@babel/helpers": "^7.25.7", ++ "@babel/parser": "^7.25.8", ++ "@babel/template": "^7.25.7", ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.8", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", -@@ -233,8 +172,9 @@ +@@ -233,6 +176,8 @@ }, "node_modules/@babel/eslint-parser": { "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.8.tgz", + "integrity": "sha512-fYP7QFngCvgxjUuw8O057SVH5jCXsbFFOoE77CFDcvzwBVgTOkMD/L4mIC5Ud1xf8chK/no2fRbSSn1wvNmKuQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-scope": "^5.1.1", - "eslint-visitor-keys": "^2.1.0", -@@ -249,12 +189,13 @@ +@@ -249,47 +194,56 @@ } }, "node_modules/@babel/generator": { - "version": "7.23.4", -- "license": "MIT", -+ "version": "7.25.5", -+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.5.tgz", -+ "integrity": "sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", ++ "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.23.4", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", -+ "@babel/types": "^7.25.4", +- "jsesc": "^2.5.1" ++ "@babel/types": "^7.25.7", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" ++ "jsesc": "^3.0.2" }, "engines": { -@@ -262,34 +203,38 @@ + "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.22.5", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", -+ "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", ++ "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" -+ "@babel/types": "^7.24.7" ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -203,15 +202,15 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.22.15", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", -+ "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz", ++ "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.15" -+ "@babel/traverse": "^7.24.7", -+ "@babel/types": "^7.24.7" ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -219,30 +218,30 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.15", -- "license": "MIT", -+ "version": "7.25.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", -+ "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", ++ "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.15", - "browserslist": "^4.21.9", -+ "@babel/compat-data": "^7.25.2", -+ "@babel/helper-validator-option": "^7.24.8", -+ "browserslist": "^4.23.1", ++ "@babel/compat-data": "^7.25.7", ++ "@babel/helper-validator-option": "^7.25.7", ++ "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, -@@ -298,18 +243,17 @@ +@@ -298,18 +252,18 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.22.15", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", -+ "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz", ++ "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", @@ -252,43 +251,43 @@ index a38125e..a1067b0 100644 - "@babel/helper-replace-supers": "^7.22.9", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", -+ "@babel/helper-annotate-as-pure": "^7.24.7", -+ "@babel/helper-member-expression-to-functions": "^7.24.8", -+ "@babel/helper-optimise-call-expression": "^7.24.7", -+ "@babel/helper-replace-supers": "^7.25.0", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", -+ "@babel/traverse": "^7.25.4", ++ "@babel/helper-annotate-as-pure": "^7.25.7", ++ "@babel/helper-member-expression-to-functions": "^7.25.7", ++ "@babel/helper-optimise-call-expression": "^7.25.7", ++ "@babel/helper-replace-supers": "^7.25.7", ++ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", ++ "@babel/traverse": "^7.25.7", "semver": "^6.3.1" }, "engines": { -@@ -320,11 +264,12 @@ +@@ -320,12 +274,14 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.22.15", -+ "version": "7.25.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", -+ "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz", ++ "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", -+ "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", +- "regexpu-core": "^5.3.1", ++ "@babel/helper-annotate-as-pure": "^7.25.7", ++ "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, -@@ -337,8 +282,9 @@ + "engines": { +@@ -337,6 +293,8 @@ }, "node_modules/@babel/helper-define-polyfill-provider": { "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz", + "integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.13.0", - "@babel/helper-module-imports": "^7.12.13", -@@ -354,63 +300,51 @@ +@@ -354,63 +312,55 @@ } }, "node_modules/@babel/helper-environment-visitor": { @@ -311,11 +310,11 @@ index a38125e..a1067b0 100644 - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", -- "license": "MIT", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", + "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" @@ -326,15 +325,15 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.23.0", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", -+ "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz", ++ "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/types": "^7.23.0" -+ "@babel/traverse": "^7.24.8", -+ "@babel/types": "^7.24.8" ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -342,14 +341,14 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.15", -- "license": "MIT", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", -+ "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", ++ "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.15" -+ "@babel/traverse": "^7.24.7", -+ "@babel/types": "^7.24.7" ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -357,36 +356,36 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-module-transforms": { - "version": "7.23.3", -- "license": "MIT", -+ "version": "7.25.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", -+ "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", ++ "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.20" -+ "@babel/helper-module-imports": "^7.24.7", -+ "@babel/helper-simple-access": "^7.24.7", -+ "@babel/helper-validator-identifier": "^7.24.7", -+ "@babel/traverse": "^7.25.2" ++ "@babel/helper-module-imports": "^7.25.7", ++ "@babel/helper-simple-access": "^7.25.7", ++ "@babel/helper-validator-identifier": "^7.25.7", ++ "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -420,32 +354,35 @@ +@@ -420,18 +370,22 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.22.5", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", -+ "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz", ++ "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" -+ "@babel/types": "^7.24.7" ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -394,65 +393,65 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", -+ "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", ++ "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=6.9.0" +@@ -439,13 +393,15 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.22.20", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", -+ "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz", ++ "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-wrap-function": "^7.22.20" -+ "@babel/helper-annotate-as-pure": "^7.24.7", -+ "@babel/helper-wrap-function": "^7.25.0", -+ "@babel/traverse": "^7.25.0" ++ "@babel/helper-annotate-as-pure": "^7.25.7", ++ "@babel/helper-wrap-function": "^7.25.7", ++ "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -455,13 +392,14 @@ +@@ -455,13 +411,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.20", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", -+ "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz", ++ "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.22.15", - "@babel/helper-optimise-call-expression": "^7.22.5" -+ "@babel/helper-member-expression-to-functions": "^7.24.8", -+ "@babel/helper-optimise-call-expression": "^7.24.7", -+ "@babel/traverse": "^7.25.0" ++ "@babel/helper-member-expression-to-functions": "^7.25.7", ++ "@babel/helper-optimise-call-expression": "^7.25.7", ++ "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -471,90 +409,90 @@ +@@ -471,90 +429,98 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.22.5", -- "license": "MIT", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", -+ "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", ++ "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" -+ "@babel/traverse": "^7.24.7", -+ "@babel/types": "^7.24.7" ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -460,12 +459,12 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.22.5", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", -+ "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz", ++ "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==", "dev": true, -- "license": "MIT", -- "dependencies": { + "license": "MIT", + "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { @@ -475,10 +474,10 @@ index a38125e..a1067b0 100644 - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "license": "MIT", - "dependencies": { +- "dependencies": { - "@babel/types": "^7.22.5" -+ "@babel/traverse": "^7.24.7", -+ "@babel/types": "^7.24.7" ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -486,48 +485,48 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helper-string-parser": { - "version": "7.23.4", -- "license": "MIT", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", -+ "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", ++ "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", -- "license": "MIT", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", -+ "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", ++ "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.15", -- "license": "MIT", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", -+ "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", ++ "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.22.20", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", -+ "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz", ++ "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-function-name": "^7.22.5", - "@babel/template": "^7.22.15", - "@babel/types": "^7.22.19" -+ "@babel/template": "^7.25.0", -+ "@babel/traverse": "^7.25.0", -+ "@babel/types": "^7.25.0" ++ "@babel/template": "^7.25.7", ++ "@babel/traverse": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -535,17 +534,17 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/helpers": { - "version": "7.23.4", -- "license": "MIT", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", -+ "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz", ++ "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", + "license": "MIT", "peer": true, "dependencies": { - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.4", - "@babel/types": "^7.23.4" -+ "@babel/template": "^7.25.0", -+ "@babel/types": "^7.25.0" ++ "@babel/template": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -553,13 +552,13 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/highlight": { - "version": "7.23.4", -- "license": "MIT", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", -+ "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", ++ "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", -+ "@babel/helper-validator-identifier": "^7.24.7", ++ "@babel/helper-validator-identifier": "^7.25.7", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", @@ -567,106 +566,104 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">=6.9.0" -@@ -562,7 +500,8 @@ +@@ -562,6 +528,8 @@ }, "node_modules/@babel/highlight/node_modules/ansi-styles": { "version": "3.2.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" - }, -@@ -572,7 +511,8 @@ +@@ -572,6 +540,8 @@ }, "node_modules/@babel/highlight/node_modules/chalk": { "version": "2.4.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", -@@ -584,32 +524,37 @@ +@@ -584,6 +554,8 @@ }, "node_modules/@babel/highlight/node_modules/color-convert": { "version": "1.9.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", "dependencies": { "color-name": "1.1.3" - } +@@ -591,10 +563,14 @@ }, "node_modules/@babel/highlight/node_modules/color-name": { "version": "1.1.3", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", -+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" ++ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", "engines": { "node": ">=0.8.0" - } +@@ -602,6 +578,8 @@ }, "node_modules/@babel/highlight/node_modules/has-flag": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", "engines": { "node": ">=4" - } +@@ -609,6 +587,8 @@ }, "node_modules/@babel/highlight/node_modules/supports-color": { "version": "5.5.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" - }, -@@ -618,9 +563,12 @@ +@@ -618,9 +598,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz", - "integrity": "sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.4.tgz", -+ "integrity": "sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==", ++ "version": "7.25.8", ++ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", ++ "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", ++ "license": "MIT", + "dependencies": { -+ "@babel/types": "^7.25.4" ++ "@babel/types": "^7.25.8" + }, "bin": { "parser": "bin/babel-parser.js" }, -@@ -629,13 +577,14 @@ +@@ -629,13 +613,15 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", -+ "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz", ++ "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.23.3" -+ "@babel/helper-plugin-utils": "^7.24.7", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", -+ "@babel/plugin-transform-optional-chaining": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", ++ "@babel/plugin-transform-optional-chaining": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -646,8 +595,10 @@ +@@ -646,6 +632,9 @@ }, "node_modules/@babel/plugin-proposal-async-generator-functions": { "version": "7.20.7", @@ -674,11 +671,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-plugin-utils": "^7.20.2", -@@ -663,8 +614,10 @@ +@@ -663,6 +652,9 @@ }, "node_modules/@babel/plugin-proposal-class-properties": { "version": "7.18.6", @@ -686,11 +681,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" -@@ -678,8 +631,10 @@ +@@ -678,6 +670,9 @@ }, "node_modules/@babel/plugin-proposal-class-static-block": { "version": "7.21.0", @@ -698,11 +691,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-static-block instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.21.0", - "@babel/helper-plugin-utils": "^7.20.2", -@@ -694,8 +649,10 @@ +@@ -694,6 +689,9 @@ }, "node_modules/@babel/plugin-proposal-dynamic-import": { "version": "7.18.6", @@ -710,11 +701,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-dynamic-import instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" -@@ -709,8 +666,10 @@ +@@ -709,6 +707,9 @@ }, "node_modules/@babel/plugin-proposal-export-namespace-from": { "version": "7.18.9", @@ -722,11 +711,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" -@@ -724,8 +683,10 @@ +@@ -724,6 +725,9 @@ }, "node_modules/@babel/plugin-proposal-json-strings": { "version": "7.18.6", @@ -734,11 +721,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-strings instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" -@@ -739,8 +700,10 @@ +@@ -739,6 +743,9 @@ }, "node_modules/@babel/plugin-proposal-logical-assignment-operators": { "version": "7.20.7", @@ -746,11 +731,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" -@@ -754,8 +717,10 @@ +@@ -754,6 +761,9 @@ }, "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { "version": "7.18.6", @@ -758,11 +741,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" -@@ -769,8 +734,10 @@ +@@ -769,6 +779,9 @@ }, "node_modules/@babel/plugin-proposal-numeric-separator": { "version": "7.18.6", @@ -770,11 +751,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" -@@ -784,8 +751,10 @@ +@@ -784,6 +797,9 @@ }, "node_modules/@babel/plugin-proposal-object-rest-spread": { "version": "7.20.7", @@ -782,11 +761,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", -@@ -802,8 +771,10 @@ +@@ -802,6 +818,9 @@ }, "node_modules/@babel/plugin-proposal-optional-catch-binding": { "version": "7.18.6", @@ -794,11 +771,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" -@@ -817,8 +788,10 @@ +@@ -817,6 +836,9 @@ }, "node_modules/@babel/plugin-proposal-optional-chaining": { "version": "7.21.0", @@ -806,11 +781,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", -@@ -833,8 +806,10 @@ +@@ -833,6 +855,9 @@ }, "node_modules/@babel/plugin-proposal-private-methods": { "version": "7.18.6", @@ -818,11 +791,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" -@@ -848,8 +823,10 @@ +@@ -848,6 +873,9 @@ }, "node_modules/@babel/plugin-proposal-private-property-in-object": { "version": "7.21.11", @@ -830,11 +801,9 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.21.0", -@@ -865,8 +842,10 @@ +@@ -865,6 +893,9 @@ }, "node_modules/@babel/plugin-proposal-unicode-property-regex": { "version": "7.18.6", @@ -842,258 +811,228 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" -@@ -880,8 +859,9 @@ +@@ -880,6 +911,8 @@ }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -891,8 +871,9 @@ +@@ -891,6 +924,8 @@ }, "node_modules/@babel/plugin-syntax-class-properties": { "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, -@@ -902,8 +883,9 @@ +@@ -902,6 +937,8 @@ }, "node_modules/@babel/plugin-syntax-class-static-block": { "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, -@@ -916,8 +898,9 @@ +@@ -916,6 +953,8 @@ }, "node_modules/@babel/plugin-syntax-dynamic-import": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -927,8 +910,9 @@ +@@ -927,6 +966,8 @@ }, "node_modules/@babel/plugin-syntax-export-namespace-from": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, -@@ -938,8 +922,9 @@ +@@ -938,6 +979,8 @@ }, "node_modules/@babel/plugin-syntax-json-strings": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -949,8 +934,9 @@ +@@ -949,6 +992,8 @@ }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, -@@ -960,8 +946,9 @@ +@@ -960,6 +1005,8 @@ }, "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -971,8 +958,9 @@ +@@ -971,6 +1018,8 @@ }, "node_modules/@babel/plugin-syntax-numeric-separator": { "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, -@@ -982,8 +970,9 @@ +@@ -982,6 +1031,8 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -993,8 +982,9 @@ +@@ -993,6 +1044,8 @@ }, "node_modules/@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -1004,8 +994,9 @@ +@@ -1004,6 +1057,8 @@ }, "node_modules/@babel/plugin-syntax-optional-chaining": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, -@@ -1015,8 +1006,9 @@ +@@ -1015,6 +1070,8 @@ }, "node_modules/@babel/plugin-syntax-private-property-in-object": { "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, -@@ -1029,8 +1021,9 @@ +@@ -1029,6 +1086,8 @@ }, "node_modules/@babel/plugin-syntax-top-level-await": { "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, -@@ -1042,11 +1035,12 @@ +@@ -1042,11 +1101,13 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.23.3", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz", -+ "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz", ++ "integrity": "sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.8" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1056,11 +1050,12 @@ +@@ -1056,11 +1117,13 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", -+ "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz", ++ "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1070,13 +1065,14 @@ +@@ -1070,13 +1133,15 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", -+ "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.7.tgz", ++ "integrity": "sha512-ZUCjAavsh5CESCmi/xCpX1qcCaAglzs/7tmuvoFnJgA1dM7gQplsguljoTg+Ru8WENpX89cQyAtWoaE0I3X3Pg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20" -+ "@babel/helper-module-imports": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7", -+ "@babel/helper-remap-async-to-generator": "^7.24.7" ++ "@babel/helper-module-imports": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-remap-async-to-generator": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1086,11 +1082,12 @@ +@@ -1086,11 +1151,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", -+ "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz", ++ "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1100,11 +1097,12 @@ +@@ -1100,11 +1167,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.23.4", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", -+ "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz", ++ "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.8" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1114,18 +1112,16 @@ +@@ -1114,18 +1183,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.23.3", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", -+ "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz", ++ "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.15", @@ -1103,589 +1042,581 @@ index a38125e..a1067b0 100644 - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", - "@babel/helper-split-export-declaration": "^7.22.6", -+ "@babel/helper-annotate-as-pure": "^7.24.7", -+ "@babel/helper-compilation-targets": "^7.25.2", -+ "@babel/helper-plugin-utils": "^7.24.8", -+ "@babel/helper-replace-supers": "^7.25.0", -+ "@babel/traverse": "^7.25.4", ++ "@babel/helper-annotate-as-pure": "^7.25.7", ++ "@babel/helper-compilation-targets": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-replace-supers": "^7.25.7", ++ "@babel/traverse": "^7.25.7", "globals": "^11.1.0" }, "engines": { -@@ -1136,12 +1132,13 @@ +@@ -1136,12 +1204,14 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", -+ "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz", ++ "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.15" -+ "@babel/helper-plugin-utils": "^7.24.7", -+ "@babel/template": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/template": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1151,11 +1148,12 @@ +@@ -1151,11 +1221,13 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.23.3", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", -+ "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz", ++ "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.8" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1165,12 +1163,13 @@ +@@ -1165,12 +1237,14 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", -+ "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz", ++ "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-create-regexp-features-plugin": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-create-regexp-features-plugin": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1180,11 +1179,12 @@ +@@ -1180,11 +1254,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", -+ "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz", ++ "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1194,12 +1194,13 @@ +@@ -1194,12 +1270,14 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", -+ "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz", ++ "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1209,11 +1210,13 @@ +@@ -1209,11 +1287,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", -+ "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz", ++ "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1223,13 +1226,14 @@ +@@ -1223,13 +1304,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.23.3", -+ "version": "7.25.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", -+ "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz", ++ "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-compilation-targets": "^7.24.8", -+ "@babel/helper-plugin-utils": "^7.24.8", -+ "@babel/traverse": "^7.25.1" ++ "@babel/helper-compilation-targets": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1239,11 +1243,12 @@ +@@ -1239,11 +1322,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.23.3", -+ "version": "7.25.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", -+ "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz", ++ "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.8" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1253,11 +1258,12 @@ +@@ -1253,11 +1338,13 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", -+ "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz", ++ "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1267,12 +1273,13 @@ +@@ -1267,12 +1354,14 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", -+ "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz", ++ "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-module-transforms": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-module-transforms": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1282,13 +1289,14 @@ +@@ -1282,13 +1371,15 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.23.3", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", -+ "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz", ++ "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-simple-access": "^7.22.5" -+ "@babel/helper-module-transforms": "^7.24.8", -+ "@babel/helper-plugin-utils": "^7.24.8", -+ "@babel/helper-simple-access": "^7.24.7" ++ "@babel/helper-module-transforms": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-simple-access": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1298,14 +1306,15 @@ +@@ -1298,14 +1389,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.23.3", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", -+ "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz", ++ "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20" -+ "@babel/helper-module-transforms": "^7.25.0", -+ "@babel/helper-plugin-utils": "^7.24.8", -+ "@babel/helper-validator-identifier": "^7.24.7", -+ "@babel/traverse": "^7.25.0" ++ "@babel/helper-module-transforms": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-validator-identifier": "^7.25.7", ++ "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1315,12 +1324,13 @@ +@@ -1315,12 +1408,14 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", -+ "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz", ++ "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-module-transforms": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-module-transforms": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1330,12 +1340,13 @@ +@@ -1330,12 +1425,14 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.22.5", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", -+ "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz", ++ "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-create-regexp-features-plugin": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-create-regexp-features-plugin": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1345,11 +1356,12 @@ +@@ -1345,11 +1442,13 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", -+ "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz", ++ "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1359,12 +1371,13 @@ +@@ -1359,12 +1458,14 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", -+ "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz", ++ "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20" -+ "@babel/helper-plugin-utils": "^7.24.7", -+ "@babel/helper-replace-supers": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-replace-supers": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1374,12 +1387,13 @@ +@@ -1374,13 +1475,14 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.23.4", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", -+ "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", ++ "version": "7.25.8", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz", ++ "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", -+ "@babel/helper-plugin-utils": "^7.24.8", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" +- "@babel/plugin-syntax-optional-chaining": "^7.8.3" ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { -@@ -1390,11 +1404,12 @@ + "node": ">=6.9.0" +@@ -1390,11 +1492,13 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", -+ "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz", ++ "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1404,11 +1419,12 @@ +@@ -1404,11 +1508,13 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", -+ "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz", ++ "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1418,11 +1434,12 @@ +@@ -1418,11 +1524,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", -+ "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz", ++ "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", -+ "@babel/helper-plugin-utils": "^7.24.7", ++ "@babel/helper-plugin-utils": "^7.25.7", "regenerator-transform": "^0.15.2" }, "engines": { -@@ -1433,11 +1450,12 @@ +@@ -1433,11 +1541,13 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", -+ "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz", ++ "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1447,11 +1465,12 @@ +@@ -1447,11 +1557,13 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", -+ "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz", ++ "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1461,12 +1480,13 @@ +@@ -1461,12 +1573,14 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", -+ "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz", ++ "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1476,11 +1496,12 @@ +@@ -1476,11 +1590,13 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", -+ "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz", ++ "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1490,11 +1511,12 @@ +@@ -1490,11 +1606,13 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", -+ "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz", ++ "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1504,11 +1526,12 @@ +@@ -1504,11 +1622,13 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.23.3", -+ "version": "7.24.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", -+ "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz", ++ "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.8" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1518,14 +1541,16 @@ +@@ -1518,14 +1638,17 @@ } }, "node_modules/@babel/plugin-transform-typescript": { - "version": "7.23.4", -+ "version": "7.25.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz", -+ "integrity": "sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.7.tgz", ++ "integrity": "sha512-VKlgy2vBzj8AmEzunocMun2fF06bsSWV+FvVXohtL6FGve/+L217qhHxRTVGHEDO/YR8IANcjzgJsd04J8ge5Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-typescript": "^7.23.3" -+ "@babel/helper-annotate-as-pure": "^7.24.7", -+ "@babel/helper-create-class-features-plugin": "^7.25.0", -+ "@babel/helper-plugin-utils": "^7.24.8", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", -+ "@babel/plugin-syntax-typescript": "^7.24.7" ++ "@babel/helper-annotate-as-pure": "^7.25.7", ++ "@babel/helper-create-class-features-plugin": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7", ++ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", ++ "@babel/plugin-syntax-typescript": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1535,11 +1560,12 @@ +@@ -1535,11 +1658,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", -+ "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz", ++ "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1549,12 +1575,13 @@ +@@ -1549,12 +1674,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.23.3", -+ "version": "7.24.7", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", -+ "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz", ++ "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5" -+ "@babel/helper-create-regexp-features-plugin": "^7.24.7", -+ "@babel/helper-plugin-utils": "^7.24.7" ++ "@babel/helper-create-regexp-features-plugin": "^7.25.7", ++ "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" -@@ -1565,8 +1592,9 @@ +@@ -1565,6 +1692,8 @@ }, "node_modules/@babel/preset-env": { "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz", + "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.15.0", - "@babel/helper-compilation-targets": "^7.15.4", -@@ -1651,8 +1679,9 @@ +@@ -1651,6 +1780,8 @@ }, "node_modules/@babel/preset-modules": { "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz", + "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", -@@ -1666,8 +1695,9 @@ +@@ -1666,6 +1797,8 @@ }, "node_modules/@babel/preset-typescript": { "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz", + "integrity": "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-validator-option": "^7.16.7", -@@ -1682,13 +1712,15 @@ +@@ -1680,13 +1813,10 @@ + "@babel/core": "^7.0.0-0" + } }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", +- "node_modules/@babel/regjsgen": { +- "version": "0.8.0", - "dev": true, - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", -+ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", -+ "dev": true - }, +- }, "node_modules/@babel/runtime": { - "version": "7.23.4", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.4.tgz", -+ "integrity": "sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", ++ "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "regenerator-runtime": "^0.14.0" - }, -@@ -1697,30 +1729,29 @@ +@@ -1697,30 +1827,31 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", -- "license": "MIT", -+ "version": "7.25.0", -+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", -+ "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", ++ "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" -+ "@babel/code-frame": "^7.24.7", -+ "@babel/parser": "^7.25.0", -+ "@babel/types": "^7.25.0" ++ "@babel/code-frame": "^7.25.7", ++ "@babel/parser": "^7.25.7", ++ "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1693,8 +1624,11 @@ index a38125e..a1067b0 100644 }, "node_modules/@babel/traverse": { - "version": "7.23.4", -- "license": "MIT", -- "dependencies": { ++ "version": "7.25.7", ++ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", ++ "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "license": "MIT", + "dependencies": { - "@babel/code-frame": "^7.23.4", - "@babel/generator": "^7.23.4", - "@babel/helper-environment-visitor": "^7.22.20", @@ -1704,48 +1638,42 @@ index a38125e..a1067b0 100644 - "@babel/parser": "^7.23.4", - "@babel/types": "^7.23.4", - "debug": "^4.1.0", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.4.tgz", -+ "integrity": "sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==", -+ "dependencies": { -+ "@babel/code-frame": "^7.24.7", -+ "@babel/generator": "^7.25.4", -+ "@babel/parser": "^7.25.4", -+ "@babel/template": "^7.25.0", -+ "@babel/types": "^7.25.4", ++ "@babel/code-frame": "^7.25.7", ++ "@babel/generator": "^7.25.7", ++ "@babel/parser": "^7.25.7", ++ "@babel/template": "^7.25.7", ++ "@babel/types": "^7.25.7", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { -@@ -1728,11 +1759,12 @@ +@@ -1728,11 +1859,13 @@ } }, "node_modules/@babel/types": { - "version": "7.23.4", -- "license": "MIT", -+ "version": "7.25.4", -+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.4.tgz", -+ "integrity": "sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==", ++ "version": "7.25.8", ++ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", ++ "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.23.4", - "@babel/helper-validator-identifier": "^7.22.20", -+ "@babel/helper-string-parser": "^7.24.8", -+ "@babel/helper-validator-identifier": "^7.24.7", ++ "@babel/helper-string-parser": "^7.25.7", ++ "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" }, "engines": { -@@ -1741,8 +1773,9 @@ +@@ -1741,6 +1874,8 @@ }, "node_modules/@commitlint/cli": { "version": "19.0.3", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-19.0.3.tgz", + "integrity": "sha512-mGhh/aYPib4Vy4h+AGRloMY+CqkmtdeKPV9poMcZeImF5e3knQ5VYaSeAM0mEzps1dbKsHvABwaDpafLUuM96g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@commitlint/format": "^19.0.3", - "@commitlint/lint": "^19.0.3", -@@ -1759,287 +1792,76 @@ +@@ -1759,285 +1894,363 @@ "node": ">=v18" } }, @@ -1757,6 +1685,7 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-vh0L8XeLaEzTe8VCxSd0gAFvfTK0RFolrzw4o431bIuWJfi/yRCHJlsDwus7wW2eJaFFDR0VFXJyjGyDQhi4vA==", "dev": true, - "license": "ISC", ++ "license": "MIT", "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", @@ -1772,11 +1701,11 @@ index a38125e..a1067b0 100644 - "node_modules/@commitlint/cli/node_modules/execa": { - "version": "8.0.1", + "node_modules/@commitlint/config-validator": { -+ "version": "19.0.3", -+ "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.0.3.tgz", -+ "integrity": "sha512-2D3r4PKjoo59zBc2auodrSCaUnCSALCx54yveOFwwP/i2kfEAQrygwOleFWswLqK0UL/F9r07MFi5ev2ohyM4Q==", ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.5.0.tgz", ++ "integrity": "sha512-CHtj92H5rdhKt17RmgALhfQt95VayrUo2tSqY9g2w+laAXyk7K/Ef6uPm9tn5qSIwSmrLjKaXK9eiNuxmQrDBw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^8.0.1", @@ -1787,7 +1716,7 @@ index a38125e..a1067b0 100644 - "onetime": "^6.0.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^3.0.0" -+ "@commitlint/types": "^19.0.3", ++ "@commitlint/types": "^19.5.0", + "ajv": "^8.11.0" }, "engines": { @@ -1801,15 +1730,15 @@ index a38125e..a1067b0 100644 - "node_modules/@commitlint/cli/node_modules/get-stream": { - "version": "8.0.1", + "node_modules/@commitlint/ensure": { -+ "version": "19.0.3", -+ "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.0.3.tgz", -+ "integrity": "sha512-SZEpa/VvBLoT+EFZVb91YWbmaZ/9rPH3ESrINOl0HD2kMYsjvl0tF7nMHh0EpTcv4+gTtZBAe1y/SS6/OhfZzQ==", ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.5.0.tgz", ++ "integrity": "sha512-Kv0pYZeMrdg48bHFEU5KKcccRfKmISSm9MvgIgkpI6m+ohFTB55qZlBW6eYqh/XDfRuIO0x4zSmvBjmOwWTwkg==", "dev": true, -- "license": "MIT", + "license": "MIT", - "engines": { - "node": ">=16" + "dependencies": { -+ "@commitlint/types": "^19.0.3", ++ "@commitlint/types": "^19.5.0", + "lodash.camelcase": "^4.3.0", + "lodash.kebabcase": "^4.1.1", + "lodash.snakecase": "^4.1.1", @@ -1825,11 +1754,12 @@ index a38125e..a1067b0 100644 - "node_modules/@commitlint/cli/node_modules/human-signals": { - "version": "5.0.0", + "node_modules/@commitlint/execute-rule": { -+ "version": "19.0.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.0.0.tgz", -+ "integrity": "sha512-mtsdpY1qyWgAO/iOK0L6gSGeR7GFcdW7tIjcNFxcWkfLDF5qVbPHKuGATFqRMsxcO8OUKNj0+3WOHB7EHm4Jdw==", ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.5.0.tgz", ++ "integrity": "sha512-aqyGgytXhl2ejlk+/rfgtwpPexYyri4t8/n4ku6rRJoRhGZpLFMqrZ+YaubeGysCP6oz4mMA34YSTaSOKEeNrg==", "dev": true, - "license": "Apache-2.0", ++ "license": "MIT", "engines": { - "node": ">=16.17.0" + "node": ">=v18" @@ -1838,121 +1768,241 @@ index a38125e..a1067b0 100644 - "node_modules/@commitlint/cli/node_modules/is-stream": { - "version": "3.0.0", + "node_modules/@commitlint/format": { -+ "version": "19.3.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-19.3.0.tgz", -+ "integrity": "sha512-luguk5/aF68HiF4H23ACAfk8qS8AHxl4LLN5oxPc24H+2+JRPsNr1OS3Gaea0CrH7PKhArBMKBz5RX9sA5NtTg==", ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-19.5.0.tgz", ++ "integrity": "sha512-yNy088miE52stCI3dhG/vvxFo9e4jFkU1Mj3xECfzp/bIS/JUay4491huAlVcffOoMK1cd296q0W92NlER6r3A==", "dev": true, -- "license": "MIT", + "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "dependencies": { -+ "@commitlint/types": "^19.0.3", ++ "@commitlint/types": "^19.5.0", + "chalk": "^5.3.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "engines": { ++ "node": ">=v18" + } + }, - "node_modules/@commitlint/cli/node_modules/mimic-fn": { - "version": "4.0.0", -- "dev": true, -- "license": "MIT", -- "engines": { ++ "node_modules/@commitlint/format/node_modules/chalk": { ++ "version": "5.3.0", ++ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", ++ "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { - "node": ">=12" -- }, -- "funding": { ++ "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, - "node_modules/@commitlint/cli/node_modules/npm-run-path": { - "version": "5.3.0", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@commitlint/is-ignored": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.5.0.tgz", ++ "integrity": "sha512-0XQ7Llsf9iL/ANtwyZ6G0NGp5Y3EQ8eDQSxv/SRcfJ0awlBY4tHFAvwWbw66FVUaWICH7iE5en+FD9TQsokZ5w==", + "dev": true, + "license": "MIT", + "dependencies": { - "path-key": "^4.0.0" -- }, -- "engines": { ++ "@commitlint/types": "^19.5.0", ++ "semver": "^7.6.0" + }, + "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" -- }, ++ "node": ">=v18" ++ } ++ }, ++ "node_modules/@commitlint/is-ignored/node_modules/semver": { ++ "version": "7.6.3", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", ++ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", ++ "dev": true, ++ "license": "ISC", ++ "bin": { ++ "semver": "bin/semver.js" + }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "engines": { ++ "node": ">=10" + } + }, - "node_modules/@commitlint/cli/node_modules/onetime": { - "version": "6.0.0", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@commitlint/lint": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-19.5.0.tgz", ++ "integrity": "sha512-cAAQwJcRtiBxQWO0eprrAbOurtJz8U6MgYqLz+p9kLElirzSCc0vGMcyCaA1O7AqBuxo11l1XsY3FhOFowLAAg==", + "dev": true, + "license": "MIT", + "dependencies": { - "mimic-fn": "^4.0.0" -- }, -- "engines": { ++ "@commitlint/is-ignored": "^19.5.0", ++ "@commitlint/parse": "^19.5.0", ++ "@commitlint/rules": "^19.5.0", ++ "@commitlint/types": "^19.5.0" + }, + "engines": { - "node": ">=12" -- }, ++ "node": ">=v18" ++ } ++ }, ++ "node_modules/@commitlint/load": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-19.5.0.tgz", ++ "integrity": "sha512-INOUhkL/qaKqwcTUvCE8iIUf5XHsEPCLY9looJ/ipzi7jtGhgmtH7OOFiNvwYgH7mA8osUWOUDV8t4E2HAi4xA==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@commitlint/config-validator": "^19.5.0", ++ "@commitlint/execute-rule": "^19.5.0", ++ "@commitlint/resolve-extends": "^19.5.0", ++ "@commitlint/types": "^19.5.0", ++ "chalk": "^5.3.0", ++ "cosmiconfig": "^9.0.0", ++ "cosmiconfig-typescript-loader": "^5.0.0", ++ "lodash.isplainobject": "^4.0.6", ++ "lodash.merge": "^4.6.2", ++ "lodash.uniq": "^4.5.0" + }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "engines": { ++ "node": ">=v18" + } + }, - "node_modules/@commitlint/cli/node_modules/path-key": { - "version": "4.0.0", -- "dev": true, -- "license": "MIT", -- "engines": { ++ "node_modules/@commitlint/load/node_modules/chalk": { ++ "version": "5.3.0", ++ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", ++ "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { - "node": ">=12" -- }, -- "funding": { ++ "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, - "node_modules/@commitlint/cli/node_modules/signal-exit": { - "version": "4.1.0", -- "dev": true, ++ "node_modules/@commitlint/load/node_modules/cosmiconfig": { ++ "version": "9.0.0", ++ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", ++ "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "dev": true, - "license": "ISC", -- "engines": { -- "node": ">=14" -- }, -- "funding": { ++ "license": "MIT", ++ "dependencies": { ++ "env-paths": "^2.2.1", ++ "import-fresh": "^3.3.0", ++ "js-yaml": "^4.1.0", ++ "parse-json": "^5.2.0" ++ }, + "engines": { + "node": ">=14" + }, + "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -- }, ++ "url": "https://github.com/sponsors/d-fischer" ++ }, ++ "peerDependencies": { ++ "typescript": ">=4.9.5" ++ }, ++ "peerDependenciesMeta": { ++ "typescript": { ++ "optional": true ++ } + } + }, - "node_modules/@commitlint/cli/node_modules/strip-final-newline": { - "version": "3.0.0", -- "dev": true, -- "license": "MIT", -- "engines": { ++ "node_modules/@commitlint/load/node_modules/cosmiconfig-typescript-loader": { ++ "version": "5.1.0", ++ "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-5.1.0.tgz", ++ "integrity": "sha512-7PtBB+6FdsOvZyJtlF3hEPpACq7RQX6BVGsgC7/lfVXnKMvNCu/XY3ykreqG5w/rBNdu2z8LCIKoF3kpHHdHlA==", + "dev": true, + "license": "MIT", ++ "dependencies": { ++ "jiti": "^1.21.6" ++ }, + "engines": { - "node": ">=12" -- }, ++ "node": ">=v16" + }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "peerDependencies": { ++ "@types/node": "*", ++ "cosmiconfig": ">=8.2", ++ "typescript": ">=4" + } + }, - "node_modules/@commitlint/cli/node_modules/wrap-ansi": { - "version": "7.0.0", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@commitlint/load/node_modules/parse-json": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", ++ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" -- }, -- "engines": { ++ "@babel/code-frame": "^7.0.0", ++ "error-ex": "^1.3.1", ++ "json-parse-even-better-errors": "^2.3.0", ++ "lines-and-columns": "^1.1.6" + }, + "engines": { - "node": ">=10" -- }, -- "funding": { ++ "node": ">=8" + }, + "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -- }, ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, - "node_modules/@commitlint/cli/node_modules/y18n": { - "version": "5.0.8", -- "dev": true, ++ "node_modules/@commitlint/load/node_modules/typescript": { ++ "version": "5.6.3", ++ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", ++ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "dev": true, - "license": "ISC", -- "engines": { ++ "license": "Apache-2.0", ++ "peer": true, ++ "bin": { ++ "tsc": "bin/tsc", ++ "tsserver": "bin/tsserver" ++ }, + "engines": { - "node": ">=10" -- } -- }, ++ "node": ">=14.17" + } + }, - "node_modules/@commitlint/cli/node_modules/yargs": { - "version": "17.7.2", -- "dev": true, -- "license": "MIT", ++ "node_modules/@commitlint/message": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-19.5.0.tgz", ++ "integrity": "sha512-R7AM4YnbxN1Joj1tMfCyBryOC5aNJBdxadTZkuqtWi3Xj0kMdutq16XQwuoGbIzL2Pk62TALV1fZDCv36+JhTQ==", + "dev": true, + "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", @@ -1970,60 +2020,99 @@ index a38125e..a1067b0 100644 - "version": "21.1.1", - "dev": true, - "license": "ISC", -- "engines": { + "engines": { - "node": ">=12" -- } -- }, ++ "node": ">=v18" + } + }, - "node_modules/@commitlint/config-conventional": { - "version": "19.0.3", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@commitlint/parse": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-19.5.0.tgz", ++ "integrity": "sha512-cZ/IxfAlfWYhAQV0TwcbdR1Oc0/r0Ik1GEessDJ3Lbuma/MRO8FRQX76eurcXtmhJC//rj52ZSZuXUg0oIX0Fw==", + "dev": true, + "license": "MIT", + "dependencies": { - "@commitlint/types": "^19.0.3", - "conventional-changelog-conventionalcommits": "^7.0.2" -- }, -- "engines": { -- "node": ">=v18" -- } -- }, ++ "@commitlint/types": "^19.5.0", ++ "conventional-changelog-angular": "^7.0.0", ++ "conventional-commits-parser": "^5.0.0" + }, + "engines": { + "node": ">=v18" + } + }, - "node_modules/@commitlint/config-conventional/node_modules/conventional-changelog-conventionalcommits": { - "version": "7.0.2", -- "dev": true, ++ "node_modules/@commitlint/read": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-19.5.0.tgz", ++ "integrity": "sha512-TjS3HLPsLsxFPQj6jou8/CZFAmOP2y+6V4PGYt3ihbQKTY1Jnv0QG28WRKl/d1ha6zLODPZqsxLEov52dhR9BQ==", + "dev": true, - "license": "ISC", -- "dependencies": { ++ "license": "MIT", + "dependencies": { - "compare-func": "^2.0.0" -- }, -- "engines": { ++ "@commitlint/top-level": "^19.5.0", ++ "@commitlint/types": "^19.5.0", ++ "git-raw-commits": "^4.0.0", ++ "minimist": "^1.2.8", ++ "tinyexec": "^0.3.0" + }, + "engines": { - "node": ">=16" -- } -- }, ++ "node": ">=v18" + } + }, - "node_modules/@commitlint/config-validator": { - "version": "19.0.3", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@commitlint/resolve-extends": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.5.0.tgz", ++ "integrity": "sha512-CU/GscZhCUsJwcKTJS9Ndh3AKGZTNFIOoQB2n8CmFnizE0VnEuJoum+COW+C1lNABEeqk6ssfc1Kkalm4bDklA==", + "dev": true, + "license": "MIT", + "dependencies": { - "@commitlint/types": "^19.0.3", - "ajv": "^8.11.0" -- }, -- "engines": { -- "node": ">=v18" -- } -- }, ++ "@commitlint/config-validator": "^19.5.0", ++ "@commitlint/types": "^19.5.0", ++ "global-directory": "^4.0.1", ++ "import-meta-resolve": "^4.0.0", ++ "lodash.mergewith": "^4.6.2", ++ "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=v18" + } + }, - "node_modules/@commitlint/config-validator/node_modules/ajv": { - "version": "8.12.0", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@commitlint/rules": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-19.5.0.tgz", ++ "integrity": "sha512-hDW5TPyf/h1/EufSHEKSp6Hs+YVsDMHazfJ2azIk9tHPXS6UqSz1dIRs1gpqS3eMXgtkT7JH6TW4IShdqOwhAw==", + "dev": true, + "license": "MIT", + "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" -- }, ++ "@commitlint/ensure": "^19.5.0", ++ "@commitlint/message": "^19.5.0", ++ "@commitlint/to-lines": "^19.5.0", ++ "@commitlint/types": "^19.5.0" + }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" -- } -- }, ++ "engines": { ++ "node": ">=v18" + } + }, - "node_modules/@commitlint/config-validator/node_modules/json-schema-traverse": { - "version": "1.0.0", - "dev": true, @@ -2031,8 +2120,12 @@ index a38125e..a1067b0 100644 - }, - "node_modules/@commitlint/ensure": { - "version": "19.0.3", -- "dev": true, -- "license": "MIT", ++ "node_modules/@commitlint/to-lines": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.5.0.tgz", ++ "integrity": "sha512-R772oj3NHPkodOSRZ9bBVNq224DOxQtNef5Pl8l2M8ZnkkzQfeSTr4uxawV2Sd3ui05dUVzvLNnzenDBO1KBeQ==", + "dev": true, + "license": "MIT", - "dependencies": { - "@commitlint/types": "^19.0.3", - "lodash.camelcase": "^4.3.0", @@ -2041,84 +2134,121 @@ index a38125e..a1067b0 100644 - "lodash.startcase": "^4.4.0", - "lodash.upperfirst": "^4.3.1" - }, -- "engines": { -- "node": ">=v18" -- } -- }, -- "node_modules/@commitlint/execute-rule": { -- "version": "19.0.0", -- "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">=v18" -- } -- }, -- "node_modules/@commitlint/format": { -- "version": "19.0.3", -- "dev": true, -- "license": "MIT", -- "dependencies": { -- "@commitlint/types": "^19.0.3", -- "chalk": "^5.3.0" -- }, -- "engines": { -- "node": ">=v18" -+ "engines": { -+ "node": ">=v18" + "engines": { + "node": ">=v18" } }, - "node_modules/@commitlint/format/node_modules/chalk": { +- "node_modules/@commitlint/execute-rule": { +- "version": "19.0.0", ++ "node_modules/@commitlint/top-level": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.5.0.tgz", ++ "integrity": "sha512-IP1YLmGAk0yWrImPRRc578I3dDUI5A2UBJx9FbSOjxe9sTlzFiwVJ+zeMLgAtHMtGZsC8LUnzmW1qRemkFU4ng==", + "dev": true, + "license": "MIT", ++ "dependencies": { ++ "find-up": "^7.0.0" ++ }, + "engines": { + "node": ">=v18" + } + }, +- "node_modules/@commitlint/format": { +- "version": "19.0.3", ++ "node_modules/@commitlint/types": { ++ "version": "19.5.0", ++ "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-19.5.0.tgz", ++ "integrity": "sha512-DSHae2obMSMkAtTBSOulg5X7/z+rGLxcXQIkg3OmWvY6wifojge5uVMydfhUvs7yQj+V7jNmRZ2Xzl8GJyqRgg==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@commitlint/types": "^19.0.3", ++ "@types/conventional-commits-parser": "^5.0.0", + "chalk": "^5.3.0" + }, + "engines": { + "node": ">=v18" + } + }, +- "node_modules/@commitlint/format/node_modules/chalk": { ++ "node_modules/@commitlint/types/node_modules/chalk": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, -@@ -2048,9 +1870,10 @@ +@@ -2047,775 +2260,978 @@ + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@commitlint/is-ignored": { +- "node_modules/@commitlint/is-ignored": { - "version": "19.0.3", -+ "version": "19.2.2", -+ "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.2.2.tgz", -+ "integrity": "sha512-eNX54oXMVxncORywF4ZPFtJoBm3Tvp111tg1xf4zWXGfhBPKpfKG6R+G3G4v5CPlRROXpAOpQ3HMhA9n1Tck1g==", ++ "node_modules/@cspotcode/source-map-support": { ++ "version": "0.8.1", ++ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", ++ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@commitlint/types": "^19.0.3", - "semver": "^7.6.0" -@@ -2059,24 +1882,11 @@ - "node": ">=v18" +- "@commitlint/types": "^19.0.3", +- "semver": "^7.6.0" ++ "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { +- "node": ">=v18" ++ "node": ">=12" } }, - "node_modules/@commitlint/is-ignored/node_modules/lru-cache": { - "version": "6.0.0", -- "dev": true, ++ "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { ++ "version": "0.3.9", ++ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", ++ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, - "license": "ISC", -- "dependencies": { ++ "license": "MIT", + "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" -- } -- }, - "node_modules/@commitlint/is-ignored/node_modules/semver": { ++ "@jridgewell/resolve-uri": "^3.0.3", ++ "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, +- "node_modules/@commitlint/is-ignored/node_modules/semver": { - "version": "7.6.0", -+ "version": "7.6.3", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", -+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", ++ "node_modules/@csstools/css-parser-algorithms": { ++ "version": "2.7.1", ++ "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz", ++ "integrity": "sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==", "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, -@@ -2084,17 +1894,13 @@ - "node": ">=10" +- "bin": { +- "semver": "bin/semver.js" +- }, ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/csstools" ++ }, ++ { ++ "type": "opencollective", ++ "url": "https://opencollective.com/csstools" ++ } ++ ], ++ "license": "MIT", + "engines": { +- "node": ">=10" ++ "node": "^14 || ^16 || >=18" ++ }, ++ "peerDependencies": { ++ "@csstools/css-tokenizer": "^2.4.1" } }, - "node_modules/@commitlint/is-ignored/node_modules/yallist": { @@ -2126,161 +2256,278 @@ index a38125e..a1067b0 100644 - "dev": true, - "license": "ISC" - }, - "node_modules/@commitlint/lint": { +- "node_modules/@commitlint/lint": { - "version": "19.0.3", -+ "version": "19.2.2", -+ "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-19.2.2.tgz", -+ "integrity": "sha512-xrzMmz4JqwGyKQKTpFzlN0dx0TAiT7Ran1fqEBgEmEj+PU98crOFtysJgY+QdeSagx6EDRigQIXJVnfrI0ratA==", ++ "node_modules/@csstools/css-tokenizer": { ++ "version": "2.4.1", ++ "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz", ++ "integrity": "sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==", "dev": true, -- "license": "MIT", - "dependencies": { ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/csstools" ++ }, ++ { ++ "type": "opencollective", ++ "url": "https://opencollective.com/csstools" ++ } ++ ], + "license": "MIT", +- "dependencies": { - "@commitlint/is-ignored": "^19.0.3", -+ "@commitlint/is-ignored": "^19.2.2", - "@commitlint/parse": "^19.0.3", - "@commitlint/rules": "^19.0.3", - "@commitlint/types": "^19.0.3" -@@ -2104,16 +1910,17 @@ - } - }, - "node_modules/@commitlint/load": { -- "version": "19.0.3", -+ "version": "19.4.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-19.4.0.tgz", -+ "integrity": "sha512-I4lCWaEZYQJ1y+Y+gdvbGAx9pYPavqZAZ3/7/8BpWh+QjscAn8AjsUpLV2PycBsEx7gupq5gM4BViV9xwTIJuw==", - "dev": true, -- "license": "MIT", - "dependencies": { - "@commitlint/config-validator": "^19.0.3", - "@commitlint/execute-rule": "^19.0.0", -- "@commitlint/resolve-extends": "^19.0.3", -+ "@commitlint/resolve-extends": "^19.1.0", - "@commitlint/types": "^19.0.3", - "chalk": "^5.3.0", -- "cosmiconfig": "^8.3.6", -+ "cosmiconfig": "^9.0.0", - "cosmiconfig-typescript-loader": "^5.0.0", - "lodash.isplainobject": "^4.0.6", - "lodash.merge": "^4.6.2", -@@ -2125,8 +1932,9 @@ - }, - "node_modules/@commitlint/load/node_modules/chalk": { - "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", -+ "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, -- "license": "MIT", +- "@commitlint/parse": "^19.0.3", +- "@commitlint/rules": "^19.0.3", +- "@commitlint/types": "^19.0.3" +- }, "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, -@@ -2135,14 +1943,15 @@ +- "node": ">=v18" ++ "node": "^14 || ^16 || >=18" } }, - "node_modules/@commitlint/load/node_modules/cosmiconfig": { -- "version": "8.3.6", -+ "version": "9.0.0", -+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", -+ "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", +- "node_modules/@commitlint/load": { +- "version": "19.0.3", ++ "node_modules/@csstools/media-query-list-parser": { ++ "version": "2.1.13", ++ "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz", ++ "integrity": "sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==", + "dev": true, ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/csstools" ++ }, ++ { ++ "type": "opencollective", ++ "url": "https://opencollective.com/csstools" ++ } ++ ], + "license": "MIT", +- "dependencies": { +- "@commitlint/config-validator": "^19.0.3", +- "@commitlint/execute-rule": "^19.0.0", +- "@commitlint/resolve-extends": "^19.0.3", +- "@commitlint/types": "^19.0.3", +- "chalk": "^5.3.0", +- "cosmiconfig": "^8.3.6", +- "cosmiconfig-typescript-loader": "^5.0.0", +- "lodash.isplainobject": "^4.0.6", +- "lodash.merge": "^4.6.2", +- "lodash.uniq": "^4.5.0" +- }, + "engines": { +- "node": ">=v18" ++ "node": "^14 || ^16 || >=18" ++ }, ++ "peerDependencies": { ++ "@csstools/css-parser-algorithms": "^2.7.1", ++ "@csstools/css-tokenizer": "^2.4.1" + } + }, +- "node_modules/@commitlint/load/node_modules/chalk": { +- "version": "5.3.0", ++ "node_modules/@csstools/selector-specificity": { ++ "version": "3.1.1", ++ "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", ++ "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", "dev": true, - "license": "MIT", ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/csstools" ++ }, ++ { ++ "type": "opencollective", ++ "url": "https://opencollective.com/csstools" ++ } ++ ], ++ "license": "MIT-0", + "engines": { +- "node": "^12.17.0 || ^14.13 || >=16.0.0" ++ "node": "^14 || ^16 || >=18" + }, +- "funding": { +- "url": "https://github.com/chalk/chalk?sponsor=1" ++ "peerDependencies": { ++ "postcss-selector-parser": "^6.0.13" + } + }, +- "node_modules/@commitlint/load/node_modules/cosmiconfig": { +- "version": "8.3.6", ++ "node_modules/@develar/schema-utils": { ++ "version": "2.6.5", ++ "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", ++ "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", + "dev": true, + "license": "MIT", "dependencies": { -+ "env-paths": "^2.2.1", - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", +- "import-fresh": "^3.3.0", +- "js-yaml": "^4.1.0", - "parse-json": "^5.2.0", - "path-type": "^4.0.0" -+ "parse-json": "^5.2.0" ++ "ajv": "^6.12.0", ++ "ajv-keywords": "^3.4.1" }, "engines": { - "node": ">=14" -@@ -2161,8 +1970,9 @@ - }, - "node_modules/@commitlint/load/node_modules/cosmiconfig-typescript-loader": { - "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-5.0.0.tgz", -+ "integrity": "sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==", - "dev": true, -- "license": "MIT", - "dependencies": { - "jiti": "^1.19.1" +- "node": ">=14" ++ "node": ">= 8.9.0" }, -@@ -2177,8 +1987,9 @@ - }, - "node_modules/@commitlint/load/node_modules/parse-json": { - "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, -- "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", -@@ -2193,9 +2004,10 @@ + "funding": { +- "url": "https://github.com/sponsors/d-fischer" +- }, +- "peerDependencies": { +- "typescript": ">=4.9.5" +- }, +- "peerDependenciesMeta": { +- "typescript": { +- "optional": true +- } ++ "type": "opencollective", ++ "url": "https://opencollective.com/webpack" } }, - "node_modules/@commitlint/load/node_modules/typescript": { +- "node_modules/@commitlint/load/node_modules/cosmiconfig-typescript-loader": { +- "version": "5.0.0", ++ "node_modules/@develar/schema-utils/node_modules/ajv": { ++ "version": "6.12.6", ++ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", ++ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { +- "jiti": "^1.19.1" +- }, +- "engines": { +- "node": ">=v16" ++ "fast-deep-equal": "^3.1.1", ++ "fast-json-stable-stringify": "^2.0.0", ++ "json-schema-traverse": "^0.4.1", ++ "uri-js": "^4.2.2" + }, +- "peerDependencies": { +- "@types/node": "*", +- "cosmiconfig": ">=8.2", +- "typescript": ">=4" ++ "funding": { ++ "type": "github", ++ "url": "https://github.com/sponsors/epoberezkin" + } + }, +- "node_modules/@commitlint/load/node_modules/parse-json": { +- "version": "5.2.0", ++ "node_modules/@develar/schema-utils/node_modules/ajv-keywords": { ++ "version": "3.5.2", ++ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", ++ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "license": "MIT", +- "dependencies": { +- "@babel/code-frame": "^7.0.0", +- "error-ex": "^1.3.1", +- "json-parse-even-better-errors": "^2.3.0", +- "lines-and-columns": "^1.1.6" +- }, +- "engines": { +- "node": ">=8" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "peerDependencies": { ++ "ajv": "^6.9.1" + } + }, +- "node_modules/@commitlint/load/node_modules/typescript": { - "version": "5.4.2", -+ "version": "5.5.4", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", -+ "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", ++ "node_modules/@develar/schema-utils/node_modules/json-schema-traverse": { ++ "version": "0.4.1", ++ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true, - "license": "Apache-2.0", - "peer": true, - "bin": { - "tsc": "bin/tsc", -@@ -2207,16 +2019,18 @@ - }, - "node_modules/@commitlint/message": { - "version": "19.0.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-19.0.0.tgz", -+ "integrity": "sha512-c9czf6lU+9oF9gVVa2lmKaOARJvt4soRsVmbR7Njwp9FpbBgste5i7l/2l5o8MmbwGh4yE1snfnsy2qyA2r/Fw==", - "dev": true, -- "license": "MIT", +- "peer": true, +- "bin": { +- "tsc": "bin/tsc", +- "tsserver": "bin/tsserver" +- }, ++ "license": "MIT" ++ }, ++ "node_modules/@discoveryjs/json-ext": { ++ "version": "0.5.7", ++ "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", ++ "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", ++ "license": "MIT", "engines": { - "node": ">=v18" +- "node": ">=14.17" ++ "node": ">=10.0.0" } }, - "node_modules/@commitlint/parse": { - "version": "19.0.3", -+ "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-19.0.3.tgz", -+ "integrity": "sha512-Il+tNyOb8VDxN3P6XoBBwWJtKKGzHlitEuXA5BP6ir/3loWlsSqDr5aecl6hZcC/spjq4pHqNh0qPlfeWu38QA==", +- "node_modules/@commitlint/message": { +- "version": "19.0.0", ++ "node_modules/@electron/asar": { ++ "version": "3.2.13", ++ "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.13.tgz", ++ "integrity": "sha512-pY5z2qQSwbFzJsBdgfJIzXf5ElHTVMutC2dxh0FD60njknMu3n1NnTABOcQwbb5/v5soqE79m9UjaJryBf3epg==", "dev": true, -- "license": "MIT", + "license": "MIT", ++ "dependencies": { ++ "@types/glob": "^7.1.0", ++ "commander": "^5.0.0", ++ "glob": "^7.1.6", ++ "minimatch": "^3.0.4" ++ }, ++ "bin": { ++ "asar": "bin/asar.js" ++ }, + "engines": { +- "node": ">=v18" ++ "node": ">=10.12.0" + } + }, +- "node_modules/@commitlint/parse": { +- "version": "19.0.3", ++ "node_modules/@electron/asar/node_modules/brace-expansion": { ++ "version": "1.1.11", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", ++ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", "dependencies": { - "@commitlint/types": "^19.0.3", - "conventional-changelog-angular": "^7.0.0", -@@ -2226,555 +2040,734 @@ - "node": ">=v18" +- "@commitlint/types": "^19.0.3", +- "conventional-changelog-angular": "^7.0.0", +- "conventional-commits-parser": "^5.0.0" +- }, +- "engines": { +- "node": ">=v18" ++ "balanced-match": "^1.0.0", ++ "concat-map": "0.0.1" } }, - "node_modules/@commitlint/parse/node_modules/conventional-changelog-angular": { - "version": "7.0.0", -+ "node_modules/@commitlint/read": { -+ "version": "19.4.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-19.4.0.tgz", -+ "integrity": "sha512-r95jLOEZzKDakXtnQub+zR3xjdnrl2XzerPwm7ch1/cc5JGq04tyaNpa6ty0CRCWdVrk4CZHhqHozb8yZwy2+g==", ++ "node_modules/@electron/asar/node_modules/minimatch": { ++ "version": "3.1.2", ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", ++ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "compare-func": "^2.0.0" -+ "@commitlint/top-level": "^19.0.0", -+ "@commitlint/types": "^19.0.3", -+ "execa": "^8.0.1", -+ "git-raw-commits": "^4.0.0", -+ "minimist": "^1.2.8" ++ "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=16" -+ "node": ">=v18" ++ "node": "*" } }, - "node_modules/@commitlint/parse/node_modules/conventional-commits-parser": { - "version": "5.0.0", -+ "node_modules/@commitlint/resolve-extends": { -+ "version": "19.1.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.1.0.tgz", -+ "integrity": "sha512-z2riI+8G3CET5CPgXJPlzftH+RiWYLMYv4C9tSLdLXdr6pBNimSKukYP9MS27ejmscqCTVA4almdLh0ODD2KYg==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@electron/get": { ++ "version": "2.0.3", ++ "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", ++ "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", + "license": "MIT", "dependencies": { - "is-text-path": "^2.0.0", - "JSONStream": "^1.3.5", @@ -2289,118 +2536,138 @@ index a38125e..a1067b0 100644 - }, - "bin": { - "conventional-commits-parser": "cli.mjs" -+ "@commitlint/config-validator": "^19.0.3", -+ "@commitlint/types": "^19.0.3", -+ "global-directory": "^4.0.1", -+ "import-meta-resolve": "^4.0.0", -+ "lodash.mergewith": "^4.6.2", -+ "resolve-from": "^5.0.0" ++ "debug": "^4.1.1", ++ "env-paths": "^2.2.0", ++ "fs-extra": "^8.1.0", ++ "got": "^11.8.5", ++ "progress": "^2.0.3", ++ "semver": "^6.2.0", ++ "sumchecker": "^3.0.1" }, "engines": { - "node": ">=16" -+ "node": ">=v18" ++ "node": ">=12" ++ }, ++ "optionalDependencies": { ++ "global-agent": "^3.0.0" } }, - "node_modules/@commitlint/parse/node_modules/is-text-path": { - "version": "2.0.0", -+ "node_modules/@commitlint/rules": { -+ "version": "19.0.3", -+ "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-19.0.3.tgz", -+ "integrity": "sha512-TspKb9VB6svklxNCKKwxhELn7qhtY1rFF8ls58DcFd0F97XoG07xugPjjbVnLqmMkRjZDbDIwBKt9bddOfLaPw==", ++ "node_modules/@electron/notarize": { ++ "version": "2.2.1", ++ "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz", ++ "integrity": "sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "text-extensions": "^2.0.0" -+ "@commitlint/ensure": "^19.0.3", -+ "@commitlint/message": "^19.0.0", -+ "@commitlint/to-lines": "^19.0.0", -+ "@commitlint/types": "^19.0.3", -+ "execa": "^8.0.1" ++ "debug": "^4.1.1", ++ "fs-extra": "^9.0.1", ++ "promise-retry": "^2.0.1" }, "engines": { - "node": ">=8" -+ "node": ">=v18" ++ "node": ">= 10.0.0" } }, - "node_modules/@commitlint/parse/node_modules/meow": { - "version": "12.1.1", -+ "node_modules/@commitlint/to-lines": { -+ "version": "19.0.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.0.0.tgz", -+ "integrity": "sha512-vkxWo+VQU5wFhiP9Ub9Sre0FYe019JxFikrALVoD5UGa8/t3yOJEpEhxC5xKiENKKhUkTpEItMTRAjHw2SCpZw==", ++ "node_modules/@electron/notarize/node_modules/fs-extra": { ++ "version": "9.1.0", ++ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", ++ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=16.10" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "node": ">=v18" - } - }, -- "node_modules/@commitlint/parse/node_modules/text-extensions": { -- "version": "2.4.0", -+ "node_modules/@commitlint/top-level": { -+ "version": "19.0.0", -+ "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.0.0.tgz", -+ "integrity": "sha512-KKjShd6u1aMGNkCkaX4aG1jOGdn7f8ZI8TR1VEuNqUOjWTOdcDSsmglinglJ18JTjuBX5I1PtjrhQCRcixRVFQ==", - "dev": true, -- "license": "MIT", + "license": "MIT", - "engines": { -- "node": ">=8" +- "node": ">=16.10" + "dependencies": { -+ "find-up": "^7.0.0" ++ "at-least-node": "^1.0.0", ++ "graceful-fs": "^4.2.0", ++ "jsonfile": "^6.0.1", ++ "universalify": "^2.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { -+ "node": ">=v18" ++ "node": ">=10" + } + }, +- "node_modules/@commitlint/parse/node_modules/text-extensions": { +- "version": "2.4.0", ++ "node_modules/@electron/notarize/node_modules/jsonfile": { ++ "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", ++ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", +- "engines": { +- "node": ">=8" ++ "dependencies": { ++ "universalify": "^2.0.0" + }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "optionalDependencies": { ++ "graceful-fs": "^4.1.6" } }, - "node_modules/@commitlint/read": { -+ "node_modules/@commitlint/types": { - "version": "19.0.3", -+ "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-19.0.3.tgz", -+ "integrity": "sha512-tpyc+7i6bPG9mvaBbtKUeghfyZSDgWquIDfMgqYtTbmZ9Y9VzEm2je9EYcQ0aoz5o7NvGS+rcDec93yO08MHYA==", +- "version": "19.0.3", ++ "node_modules/@electron/notarize/node_modules/universalify": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", ++ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", - "dependencies": { + "license": "MIT", +- "dependencies": { - "@commitlint/top-level": "^19.0.0", - "@commitlint/types": "^19.0.3", - "git-raw-commits": "^4.0.0", - "minimist": "^1.2.8" -+ "@types/conventional-commits-parser": "^5.0.0", -+ "chalk": "^5.3.0" - }, +- }, "engines": { - "node": ">=v18" +- "node": ">=v18" ++ "node": ">= 10.0.0" } }, - "node_modules/@commitlint/read/node_modules/dargs": { - "version": "8.1.0", -+ "node_modules/@commitlint/types/node_modules/chalk": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", -+ "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", ++ "node_modules/@electron/osx-sign": { ++ "version": "1.0.5", ++ "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz", ++ "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==", "dev": true, - "license": "MIT", - "engines": { +- "engines": { - "node": ">=12" -+ "node": "^12.17.0 || ^14.13 || >=16.0.0" ++ "license": "BSD-2-Clause", ++ "dependencies": { ++ "compare-version": "^0.1.2", ++ "debug": "^4.3.4", ++ "fs-extra": "^10.0.0", ++ "isbinaryfile": "^4.0.8", ++ "minimist": "^1.2.6", ++ "plist": "^3.0.5" }, - "funding": { +- "funding": { - "url": "https://github.com/sponsors/sindresorhus" -+ "url": "https://github.com/chalk/chalk?sponsor=1" ++ "bin": { ++ "electron-osx-flat": "bin/electron-osx-flat.js", ++ "electron-osx-sign": "bin/electron-osx-sign.js" ++ }, ++ "engines": { ++ "node": ">=12.0.0" } }, - "node_modules/@commitlint/read/node_modules/git-raw-commits": { - "version": "4.0.0", -+ "node_modules/@cspotcode/source-map-support": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", -+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", ++ "node_modules/@electron/osx-sign/node_modules/fs-extra": { ++ "version": "10.1.0", ++ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", ++ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "dargs": "^8.0.0", - "meow": "^12.0.1", @@ -2408,7 +2675,9 @@ index a38125e..a1067b0 100644 - }, - "bin": { - "git-raw-commits": "cli.mjs" -+ "@jridgewell/trace-mapping": "0.3.9" ++ "graceful-fs": "^4.2.0", ++ "jsonfile": "^6.0.1", ++ "universalify": "^2.0.0" }, "engines": { - "node": ">=16" @@ -2417,141 +2686,101 @@ index a38125e..a1067b0 100644 }, - "node_modules/@commitlint/read/node_modules/meow": { - "version": "12.1.1", -+ "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { -+ "version": "0.3.9", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", -+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", ++ "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { ++ "version": "4.0.10", ++ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", ++ "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", "dev": true, -- "license": "MIT", -+ "dependencies": { -+ "@jridgewell/resolve-uri": "^3.0.3", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ } -+ }, -+ "node_modules/@csstools/css-parser-algorithms": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz", -+ "integrity": "sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==", -+ "dev": true, -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/csstools" -+ }, -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/csstools" -+ } -+ ], + "license": "MIT", "engines": { - "node": ">=16.10" -+ "node": "^14 || ^16 || >=18" ++ "node": ">= 8.0.0" }, -- "funding": { + "funding": { - "url": "https://github.com/sponsors/sindresorhus" -+ "peerDependencies": { -+ "@csstools/css-tokenizer": "^2.4.1" ++ "url": "https://github.com/sponsors/gjtorikian/" } }, - "node_modules/@commitlint/resolve-extends": { - "version": "19.0.3", -+ "node_modules/@csstools/css-tokenizer": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz", -+ "integrity": "sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==", ++ "node_modules/@electron/osx-sign/node_modules/jsonfile": { ++ "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", ++ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", -- "dependencies": { + "license": "MIT", + "dependencies": { - "@commitlint/config-validator": "^19.0.3", - "@commitlint/types": "^19.0.3", - "global-directory": "^4.0.1", - "import-meta-resolve": "^4.0.0", - "lodash.mergewith": "^4.6.2", - "resolve-from": "^5.0.0" -- }, -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/csstools" -+ }, -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/csstools" -+ } -+ ], - "engines": { ++ "universalify": "^2.0.0" + }, +- "engines": { - "node": ">=v18" -+ "node": "^14 || ^16 || >=18" ++ "optionalDependencies": { ++ "graceful-fs": "^4.1.6" } }, - "node_modules/@commitlint/resolve-extends/node_modules/resolve-from": { - "version": "5.0.0", -+ "node_modules/@csstools/media-query-list-parser": { -+ "version": "2.1.13", -+ "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz", -+ "integrity": "sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==", ++ "node_modules/@electron/osx-sign/node_modules/universalify": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", ++ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/csstools" -+ }, -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/csstools" -+ } -+ ], + "license": "MIT", "engines": { - "node": ">=8" -+ "node": "^14 || ^16 || >=18" -+ }, -+ "peerDependencies": { -+ "@csstools/css-parser-algorithms": "^2.7.1", -+ "@csstools/css-tokenizer": "^2.4.1" ++ "node": ">= 10.0.0" } }, - "node_modules/@commitlint/rules": { - "version": "19.0.3", -+ "node_modules/@csstools/selector-specificity": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", -+ "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", ++ "node_modules/@electron/remote": { ++ "version": "2.1.2", ++ "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", ++ "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", ++ "license": "MIT", ++ "peerDependencies": { ++ "electron": ">= 13.0.0" ++ } ++ }, ++ "node_modules/@electron/universal": { ++ "version": "1.5.1", ++ "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz", ++ "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==", "dev": true, -- "license": "MIT", -- "dependencies": { + "license": "MIT", + "dependencies": { - "@commitlint/ensure": "^19.0.3", - "@commitlint/message": "^19.0.0", - "@commitlint/to-lines": "^19.0.0", - "@commitlint/types": "^19.0.3", - "execa": "^8.0.1" -- }, -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/csstools" -+ }, -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/csstools" -+ } -+ ], ++ "@electron/asar": "^3.2.1", ++ "@malept/cross-spawn-promise": "^1.1.0", ++ "debug": "^4.3.1", ++ "dir-compare": "^3.0.0", ++ "fs-extra": "^9.0.1", ++ "minimatch": "^3.0.4", ++ "plist": "^3.0.4" + }, "engines": { - "node": ">=v18" -+ "node": "^14 || ^16 || >=18" -+ }, -+ "peerDependencies": { -+ "postcss-selector-parser": "^6.0.13" ++ "node": ">=8.6" } }, - "node_modules/@commitlint/rules/node_modules/execa": { - "version": "8.0.1", -+ "node_modules/@develar/schema-utils": { -+ "version": "2.6.5", -+ "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", -+ "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", ++ "node_modules/@electron/universal/node_modules/brace-expansion": { ++ "version": "1.1.11", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", ++ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^8.0.1", @@ -2562,365 +2791,6 @@ index a38125e..a1067b0 100644 - "onetime": "^6.0.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^3.0.0" -+ "ajv": "^6.12.0", -+ "ajv-keywords": "^3.4.1" - }, - "engines": { -- "node": ">=16.17" -+ "node": ">= 8.9.0" - }, - "funding": { -- "url": "https://github.com/sindresorhus/execa?sponsor=1" -+ "type": "opencollective", -+ "url": "https://opencollective.com/webpack" - } - }, -- "node_modules/@commitlint/rules/node_modules/get-stream": { -- "version": "8.0.1", -+ "node_modules/@develar/schema-utils/node_modules/ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">=16" -+ "dependencies": { -+ "fast-deep-equal": "^3.1.1", -+ "fast-json-stable-stringify": "^2.0.0", -+ "json-schema-traverse": "^0.4.1", -+ "uri-js": "^4.2.2" - }, - "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "type": "github", -+ "url": "https://github.com/sponsors/epoberezkin" - } - }, -- "node_modules/@commitlint/rules/node_modules/human-signals": { -- "version": "5.0.0", -+ "node_modules/@develar/schema-utils/node_modules/ajv-keywords": { -+ "version": "3.5.2", -+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", -+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, -- "license": "Apache-2.0", -+ "peerDependencies": { -+ "ajv": "^6.9.1" -+ } -+ }, -+ "node_modules/@develar/schema-utils/node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", -+ "dev": true -+ }, -+ "node_modules/@discoveryjs/json-ext": { -+ "version": "0.5.7", -+ "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", -+ "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", - "engines": { -- "node": ">=16.17.0" -+ "node": ">=10.0.0" - } - }, -- "node_modules/@commitlint/rules/node_modules/is-stream": { -- "version": "3.0.0", -+ "node_modules/@electron/asar": { -+ "version": "3.2.10", -+ "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz", -+ "integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" -+ "dependencies": { -+ "commander": "^5.0.0", -+ "glob": "^7.1.6", -+ "minimatch": "^3.0.4" - }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "bin": { -+ "asar": "bin/asar.js" -+ }, -+ "engines": { -+ "node": ">=10.12.0" - } - }, -- "node_modules/@commitlint/rules/node_modules/mimic-fn": { -- "version": "4.0.0", -+ "node_modules/@electron/asar/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">=12" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" - } - }, -- "node_modules/@commitlint/rules/node_modules/npm-run-path": { -- "version": "5.3.0", -+ "node_modules/@electron/asar/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "path-key": "^4.0.0" -+ "brace-expansion": "^1.1.7" - }, - "engines": { -- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "node": "*" - } - }, -- "node_modules/@commitlint/rules/node_modules/onetime": { -- "version": "6.0.0", -- "dev": true, -- "license": "MIT", -+ "node_modules/@electron/get": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", -+ "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", - "dependencies": { -- "mimic-fn": "^4.0.0" -+ "debug": "^4.1.1", -+ "env-paths": "^2.2.0", -+ "fs-extra": "^8.1.0", -+ "got": "^11.8.5", -+ "progress": "^2.0.3", -+ "semver": "^6.2.0", -+ "sumchecker": "^3.0.1" - }, - "engines": { - "node": ">=12" - }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "optionalDependencies": { -+ "global-agent": "^3.0.0" - } - }, -- "node_modules/@commitlint/rules/node_modules/path-key": { -- "version": "4.0.0", -+ "node_modules/@electron/notarize": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz", -+ "integrity": "sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">=12" -+ "dependencies": { -+ "debug": "^4.1.1", -+ "fs-extra": "^9.0.1", -+ "promise-retry": "^2.0.1" - }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "engines": { -+ "node": ">= 10.0.0" - } - }, -- "node_modules/@commitlint/rules/node_modules/signal-exit": { -- "version": "4.1.0", -+ "node_modules/@electron/notarize/node_modules/fs-extra": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", -+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, -- "license": "ISC", -- "engines": { -- "node": ">=14" -+ "dependencies": { -+ "at-least-node": "^1.0.0", -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^6.0.1", -+ "universalify": "^2.0.0" - }, -- "funding": { -- "url": "https://github.com/sponsors/isaacs" -+ "engines": { -+ "node": ">=10" - } - }, -- "node_modules/@commitlint/rules/node_modules/strip-final-newline": { -- "version": "3.0.0", -+ "node_modules/@electron/notarize/node_modules/jsonfile": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">=12" -+ "dependencies": { -+ "universalify": "^2.0.0" - }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" - } - }, -- "node_modules/@commitlint/to-lines": { -- "version": "19.0.0", -+ "node_modules/@electron/notarize/node_modules/universalify": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", -+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=v18" -+ "node": ">= 10.0.0" - } - }, -- "node_modules/@commitlint/top-level": { -- "version": "19.0.0", -+ "node_modules/@electron/osx-sign": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz", -+ "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "find-up": "^7.0.0" -+ "compare-version": "^0.1.2", -+ "debug": "^4.3.4", -+ "fs-extra": "^10.0.0", -+ "isbinaryfile": "^4.0.8", -+ "minimist": "^1.2.6", -+ "plist": "^3.0.5" -+ }, -+ "bin": { -+ "electron-osx-flat": "bin/electron-osx-flat.js", -+ "electron-osx-sign": "bin/electron-osx-sign.js" - }, - "engines": { -- "node": ">=v18" -+ "node": ">=12.0.0" - } - }, -- "node_modules/@commitlint/top-level/node_modules/find-up": { -- "version": "7.0.0", -+ "node_modules/@electron/osx-sign/node_modules/fs-extra": { -+ "version": "10.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", -+ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "locate-path": "^7.2.0", -- "path-exists": "^5.0.0", -- "unicorn-magic": "^0.1.0" -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^6.0.1", -+ "universalify": "^2.0.0" - }, - "engines": { -- "node": ">=18" -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { -+ "version": "4.0.10", -+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", -+ "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", -+ "dev": true, -+ "engines": { -+ "node": ">= 8.0.0" - }, - "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "url": "https://github.com/sponsors/gjtorikian/" - } - }, -- "node_modules/@commitlint/top-level/node_modules/locate-path": { -- "version": "7.2.0", -+ "node_modules/@electron/osx-sign/node_modules/jsonfile": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "p-locate": "^6.0.0" -+ "universalify": "^2.0.0" - }, -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/@electron/osx-sign/node_modules/universalify": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", -+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", -+ "dev": true, - "engines": { -- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "node": ">= 10.0.0" - } - }, -- "node_modules/@commitlint/top-level/node_modules/p-limit": { -- "version": "4.0.0", -+ "node_modules/@electron/remote": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", -+ "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", -+ "peerDependencies": { -+ "electron": ">= 13.0.0" -+ } -+ }, -+ "node_modules/@electron/universal": { -+ "version": "1.5.1", -+ "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz", -+ "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "yocto-queue": "^1.0.0" -+ "@electron/asar": "^3.2.1", -+ "@malept/cross-spawn-promise": "^1.1.0", -+ "debug": "^4.3.1", -+ "dir-compare": "^3.0.0", -+ "fs-extra": "^9.0.1", -+ "minimatch": "^3.0.4", -+ "plist": "^3.0.4" - }, - "engines": { -- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "node": ">=8.6" - } - }, -- "node_modules/@commitlint/top-level/node_modules/p-locate": { -- "version": "6.0.0", -+ "node_modules/@electron/universal/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "p-limit": "^4.0.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } @@ -2930,6 +2800,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", @@ -2937,15 +2808,23 @@ index a38125e..a1067b0 100644 + "universalify": "^2.0.0" }, "engines": { -- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" +- "node": ">=16.17" +- }, +- "funding": { +- "url": "https://github.com/sindresorhus/execa?sponsor=1" + "node": ">=10" -+ } -+ }, + } + }, +- "node_modules/@commitlint/rules/node_modules/get-stream": { +- "version": "8.0.1", + "node_modules/@electron/universal/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", -+ "dev": true, + "dev": true, + "license": "MIT", +- "engines": { +- "node": ">=16" + "dependencies": { + "universalify": "^2.0.0" }, @@ -2955,49 +2834,50 @@ index a38125e..a1067b0 100644 + "graceful-fs": "^4.1.6" } }, -- "node_modules/@commitlint/top-level/node_modules/path-exists": { +- "node_modules/@commitlint/rules/node_modules/human-signals": { - "version": "5.0.0", + "node_modules/@electron/universal/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "MIT", +- "license": "Apache-2.0", ++ "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, "engines": { -- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" +- "node": ">=16.17.0" + "node": "*" } }, -- "node_modules/@commitlint/top-level/node_modules/yocto-queue": { -- "version": "1.0.0", +- "node_modules/@commitlint/rules/node_modules/is-stream": { +- "version": "3.0.0", + "node_modules/@electron/universal/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { -- "node": ">=12.20" +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 10.0.0" } }, -- "node_modules/@commitlint/types": { -- "version": "19.0.3", +- "node_modules/@commitlint/rules/node_modules/mimic-fn": { +- "version": "4.0.0", + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", "dev": true, -- "license": "MIT", - "dependencies": { -- "@types/conventional-commits-parser": "^5.0.0", -- "chalk": "^5.3.0" + "license": "MIT", +- "engines": { +- "node": ">=12" ++ "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", @@ -3008,70 +2888,444 @@ index a38125e..a1067b0 100644 + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" }, - "engines": { -- "node": ">=v18" +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "engines": { + "node": "^10.12.0 || >=12.0.0" } }, -- "node_modules/@commitlint/types/node_modules/chalk": { +- "node_modules/@commitlint/rules/node_modules/npm-run-path": { - "version": "5.3.0", + "node_modules/@eslint/eslintrc/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, -- "license": "MIT", + "license": "MIT", + "dependencies": { +- "path-key": "^4.0.0" +- }, - "engines": { -- "node": "^12.17.0 || ^14.13 || >=16.0.0" -+ "dependencies": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" }, "funding": { -- "url": "https://github.com/chalk/chalk?sponsor=1" +- "url": "https://github.com/sponsors/sindresorhus" + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, -- "node_modules/@cspotcode/source-map-support": { -- "version": "0.8.1", +- "node_modules/@commitlint/rules/node_modules/onetime": { +- "version": "6.0.0", + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { -- "@jridgewell/trace-mapping": "0.3.9" -- }, -- "engines": { -- "node": ">=12" +- "mimic-fn": "^4.0.0" + "sprintf-js": "~1.0.2" - } - }, -- "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { -- "version": "0.3.9", ++ } ++ }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "@jridgewell/resolve-uri": "^3.0.3", -- "@jridgewell/sourcemap-codec": "^1.4.10" ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" - } - }, -- "node_modules/@csstools/css-parser-algorithms": { -- "version": "2.3.2", ++ } ++ }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "type-fest": "^0.20.2" + }, + "engines": { +- "node": ">=12" ++ "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/@commitlint/rules/node_modules/path-key": { +- "version": "4.0.0", ++ "node_modules/@eslint/eslintrc/node_modules/ignore": { ++ "version": "4.0.6", ++ "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", ++ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "license": "MIT", + "engines": { +- "node": ">=12" ++ "node": ">= 4" ++ } ++ }, ++ "node_modules/@eslint/eslintrc/node_modules/js-yaml": { ++ "version": "3.14.1", ++ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", ++ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "argparse": "^1.0.7", ++ "esprima": "^4.0.0" + }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "bin": { ++ "js-yaml": "bin/js-yaml.js" + } + }, +- "node_modules/@commitlint/rules/node_modules/signal-exit": { +- "version": "4.1.0", ++ "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { ++ "version": "0.4.1", ++ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@eslint/eslintrc/node_modules/minimatch": { ++ "version": "3.1.2", ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", ++ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", +- "engines": { +- "node": ">=14" ++ "dependencies": { ++ "brace-expansion": "^1.1.7" + }, +- "funding": { +- "url": "https://github.com/sponsors/isaacs" ++ "engines": { ++ "node": "*" + } + }, +- "node_modules/@commitlint/rules/node_modules/strip-final-newline": { +- "version": "3.0.0", ++ "node_modules/@eslint/eslintrc/node_modules/sprintf-js": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", ++ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, +- "license": "MIT", ++ "license": "BSD-3-Clause" ++ }, ++ "node_modules/@eslint/eslintrc/node_modules/type-fest": { ++ "version": "0.20.2", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", ++ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", ++ "dev": true, ++ "license": "(MIT OR CC0-1.0)", + "engines": { +- "node": ">=12" ++ "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/@commitlint/to-lines": { +- "version": "19.0.0", +- "dev": true, ++ "node_modules/@fabio286/ssh2-promise": { ++ "version": "1.0.4-b", ++ "resolved": "https://registry.npmjs.org/@fabio286/ssh2-promise/-/ssh2-promise-1.0.4-b.tgz", ++ "integrity": "sha512-tqYu7yX4GQXpM4zN80s2EURLgMNyrUDJaImZqIHIRkCxjwq3mdK7uATF4zXu/je9XRD3OVfkQXRoY+H9LwlVoA==", ++ "license": "MIT", ++ "dependencies": { ++ "@heroku/socksv5": "^0.0.9", ++ "ssh2": "~1.14.0" ++ } ++ }, ++ "node_modules/@faker-js/faker": { ++ "version": "6.1.2", ++ "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-6.1.2.tgz", ++ "integrity": "sha512-QSvmexHCxeRUk1/yKmoEDaWB5Hohjvtim5g2JJwy8S/l0L4b3y/GxSpE6vN4SBoVGGahEQW21uqyRr7EofI35A==", ++ "deprecated": "Please update to a newer version.", + "license": "MIT", + "engines": { +- "node": ">=v18" ++ "node": ">=14.0.0", ++ "npm": ">=6.0.0" + } + }, +- "node_modules/@commitlint/top-level": { +- "version": "19.0.0", +- "dev": true, ++ "node_modules/@floating-ui/core": { ++ "version": "1.6.8", ++ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz", ++ "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==", + "license": "MIT", + "dependencies": { +- "find-up": "^7.0.0" +- }, +- "engines": { +- "node": ">=v18" ++ "@floating-ui/utils": "^0.2.8" + } + }, +- "node_modules/@commitlint/top-level/node_modules/find-up": { +- "version": "7.0.0", +- "dev": true, ++ "node_modules/@floating-ui/dom": { ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.1.tgz", ++ "integrity": "sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw==", + "license": "MIT", + "dependencies": { +- "locate-path": "^7.2.0", +- "path-exists": "^5.0.0", +- "unicorn-magic": "^0.1.0" ++ "@floating-ui/core": "^1.1.0" ++ } ++ }, ++ "node_modules/@floating-ui/utils": { ++ "version": "0.2.8", ++ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", ++ "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==", ++ "license": "MIT" ++ }, ++ "node_modules/@heroku/socksv5": { ++ "version": "0.0.9", ++ "resolved": "https://registry.npmjs.org/@heroku/socksv5/-/socksv5-0.0.9.tgz", ++ "integrity": "sha512-bV8v7R/c0gNve8i7yPmZbcCTJUqRbCnMSvcegcMaz+ly+FoZf9i4+3MTjKsX+OZn9w0w1I6VJYQBcdM+yMWPQQ==", ++ "license": "MIT", ++ "dependencies": { ++ "ip-address": "^5.8.8" + }, + "engines": { +- "node": ">=18" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "node": ">=0.10.0" + } + }, +- "node_modules/@commitlint/top-level/node_modules/locate-path": { +- "version": "7.2.0", ++ "node_modules/@humanwhocodes/config-array": { ++ "version": "0.5.0", ++ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", ++ "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", ++ "deprecated": "Use @eslint/config-array instead", + "dev": true, +- "license": "MIT", ++ "license": "Apache-2.0", + "dependencies": { +- "p-locate": "^6.0.0" ++ "@humanwhocodes/object-schema": "^1.2.0", ++ "debug": "^4.1.1", ++ "minimatch": "^3.0.4" + }, + "engines": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "node": ">=10.10.0" + } + }, +- "node_modules/@commitlint/top-level/node_modules/p-limit": { +- "version": "4.0.0", ++ "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { ++ "version": "1.1.11", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", ++ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { +- "yocto-queue": "^1.0.0" ++ "balanced-match": "^1.0.0", ++ "concat-map": "0.0.1" ++ } ++ }, ++ "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { ++ "version": "3.1.2", ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", ++ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", ++ "dev": true, ++ "license": "ISC", ++ "dependencies": { ++ "brace-expansion": "^1.1.7" + }, + "engines": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "node": "*" + } + }, +- "node_modules/@commitlint/top-level/node_modules/p-locate": { +- "version": "6.0.0", ++ "node_modules/@humanwhocodes/object-schema": { ++ "version": "1.2.1", ++ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", ++ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", ++ "deprecated": "Use @eslint/object-schema instead", + "dev": true, ++ "license": "BSD-3-Clause" ++ }, ++ "node_modules/@hutson/parse-repository-url": { ++ "version": "3.0.2", ++ "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", ++ "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", ++ "dev": true, ++ "license": "Apache-2.0", ++ "engines": { ++ "node": ">=6.9.0" ++ } ++ }, ++ "node_modules/@intlify/core-base": { ++ "version": "9.13.1", ++ "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz", ++ "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==", + "license": "MIT", + "dependencies": { +- "p-limit": "^4.0.0" ++ "@intlify/message-compiler": "9.13.1", ++ "@intlify/shared": "9.13.1" + }, + "engines": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" ++ "node": ">= 16" + }, + "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "url": "https://github.com/sponsors/kazupon" + } + }, +- "node_modules/@commitlint/top-level/node_modules/path-exists": { +- "version": "5.0.0", +- "dev": true, ++ "node_modules/@intlify/message-compiler": { ++ "version": "9.13.1", ++ "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz", ++ "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==", + "license": "MIT", ++ "dependencies": { ++ "@intlify/shared": "9.13.1", ++ "source-map-js": "^1.0.2" ++ }, + "engines": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" ++ "node": ">= 16" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/kazupon" + } + }, +- "node_modules/@commitlint/top-level/node_modules/yocto-queue": { +- "version": "1.0.0", +- "dev": true, ++ "node_modules/@intlify/shared": { ++ "version": "9.13.1", ++ "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.13.1.tgz", ++ "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==", + "license": "MIT", + "engines": { +- "node": ">=12.20" ++ "node": ">= 16" + }, + "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "url": "https://github.com/sponsors/kazupon" + } + }, +- "node_modules/@commitlint/types": { +- "version": "19.0.3", ++ "node_modules/@isaacs/cliui": { ++ "version": "8.0.2", ++ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", ++ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, +- "license": "MIT", ++ "license": "ISC", + "dependencies": { +- "@types/conventional-commits-parser": "^5.0.0", +- "chalk": "^5.3.0" ++ "string-width": "^5.1.2", ++ "string-width-cjs": "npm:string-width@^4.2.0", ++ "strip-ansi": "^7.0.1", ++ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", ++ "wrap-ansi": "^8.1.0", ++ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { +- "node": ">=v18" ++ "node": ">=12" + } + }, +- "node_modules/@commitlint/types/node_modules/chalk": { +- "version": "5.3.0", ++ "node_modules/@isaacs/cliui/node_modules/ansi-regex": { ++ "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", ++ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { +- "node": "^12.17.0 || ^14.13 || >=16.0.0" ++ "node": ">=12" + }, + "funding": { +- "url": "https://github.com/chalk/chalk?sponsor=1" ++ "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, +- "node_modules/@cspotcode/source-map-support": { +- "version": "0.8.1", ++ "node_modules/@isaacs/cliui/node_modules/ansi-styles": { ++ "version": "6.2.1", ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", ++ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", +- "dependencies": { +- "@jridgewell/trace-mapping": "0.3.9" +- }, + "engines": { + "node": ">=12" ++ }, ++ "funding": { ++ "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, +- "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { +- "version": "0.3.9", ++ "node_modules/@isaacs/cliui/node_modules/emoji-regex": { ++ "version": "9.2.2", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", ++ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, +- "license": "MIT", +- "dependencies": { +- "@jridgewell/resolve-uri": "^3.0.3", +- "@jridgewell/sourcemap-codec": "^1.4.10" +- } ++ "license": "MIT" + }, +- "node_modules/@csstools/css-parser-algorithms": { +- "version": "2.3.2", ++ "node_modules/@isaacs/cliui/node_modules/string-width": { ++ "version": "5.1.2", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", ++ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, - "funding": [ - { @@ -3083,13 +3337,15 @@ index a38125e..a1067b0 100644 - "url": "https://opencollective.com/csstools" - } - ], -- "license": "MIT", + "license": "MIT", + "dependencies": { -+ "type-fest": "^0.20.2" ++ "eastasianwidth": "^0.2.0", ++ "emoji-regex": "^9.2.2", ++ "strip-ansi": "^7.0.1" + }, "engines": { - "node": "^14 || ^16 || >=18" -+ "node": ">=8" ++ "node": ">=12" }, - "peerDependencies": { - "@csstools/css-tokenizer": "^2.2.1" @@ -3099,10 +3355,10 @@ index a38125e..a1067b0 100644 }, - "node_modules/@csstools/css-tokenizer": { - "version": "2.2.1", -+ "node_modules/@eslint/eslintrc/node_modules/ignore": { -+ "version": "4.0.6", -+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", -+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", ++ "node_modules/@isaacs/cliui/node_modules/strip-ansi": { ++ "version": "7.1.0", ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", ++ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, - "funding": [ - { @@ -3114,18 +3370,24 @@ index a38125e..a1067b0 100644 - "url": "https://opencollective.com/csstools" - } - ], -- "license": "MIT", + "license": "MIT", ++ "dependencies": { ++ "ansi-regex": "^6.0.1" ++ }, "engines": { - "node": "^14 || ^16 || >=18" -+ "node": ">= 4" ++ "node": ">=12" ++ }, ++ "funding": { ++ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.5", -+ "node_modules/@eslint/eslintrc/node_modules/js-yaml": { -+ "version": "3.14.1", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", -+ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", ++ "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { ++ "version": "8.1.0", ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", ++ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, - "funding": [ - { @@ -3137,33 +3399,22 @@ index a38125e..a1067b0 100644 - "url": "https://opencollective.com/csstools" - } - ], -- "license": "MIT", + "license": "MIT", - "engines": { - "node": "^14 || ^16 || >=18" + "dependencies": { -+ "argparse": "^1.0.7", -+ "esprima": "^4.0.0" ++ "ansi-styles": "^6.1.0", ++ "string-width": "^5.0.1", ++ "strip-ansi": "^7.0.1" }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.3.2", - "@csstools/css-tokenizer": "^2.2.1" -+ "bin": { -+ "js-yaml": "bin/js-yaml.js" - } - }, +- } +- }, - "node_modules/@csstools/selector-specificity": { - "version": "3.0.0", -+ "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", -+ "dev": true -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, +- "dev": true, - "funding": [ - { - "type": "github", @@ -3175,153 +3426,145 @@ index a38125e..a1067b0 100644 - } - ], - "license": "MIT-0", -- "engines": { + "engines": { - "node": "^14 || ^16 || >=18" -+ "dependencies": { -+ "brace-expansion": "^1.1.7" ++ "node": ">=12" }, - "peerDependencies": { - "postcss-selector-parser": "^6.0.13" -+ "engines": { -+ "node": "*" ++ "funding": { ++ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/@develar/schema-utils": { - "version": "2.6.5", -+ "node_modules/@eslint/eslintrc/node_modules/sprintf-js": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", -+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", -+ "dev": true +- "dev": true, ++ "node_modules/@jamescoyle/vue-icon": { ++ "version": "0.1.2", ++ "resolved": "https://registry.npmjs.org/@jamescoyle/vue-icon/-/vue-icon-0.1.2.tgz", ++ "integrity": "sha512-KFrImXx5TKIi6iQXlnyLEBl4rNosNKbTeRnr70ucTdUaciVmd9qK9d/pZAaKt1Ob/8xNnX2GMp8LisyHdKtEgw==", ++ "license": "MIT" + }, -+ "node_modules/@eslint/eslintrc/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@jridgewell/gen-mapping": { ++ "version": "0.3.5", ++ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", ++ "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "license": "MIT", + "dependencies": { - "ajv": "^6.12.0", - "ajv-keywords": "^3.4.1" -- }, ++ "@jridgewell/set-array": "^1.2.1", ++ "@jridgewell/sourcemap-codec": "^1.4.10", ++ "@jridgewell/trace-mapping": "^0.3.24" + }, "engines": { - "node": ">= 8.9.0" -+ "node": ">=10" - }, - "funding": { +- }, +- "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" -+ "url": "https://github.com/sponsors/sindresorhus" ++ "node": ">=6.0.0" } }, - "node_modules/@discoveryjs/json-ext": { - "version": "0.5.7", -- "license": "MIT", -+ "node_modules/@fabio286/ssh2-promise": { -+ "version": "1.0.4-b", -+ "resolved": "https://registry.npmjs.org/@fabio286/ssh2-promise/-/ssh2-promise-1.0.4-b.tgz", -+ "integrity": "sha512-tqYu7yX4GQXpM4zN80s2EURLgMNyrUDJaImZqIHIRkCxjwq3mdK7uATF4zXu/je9XRD3OVfkQXRoY+H9LwlVoA==", -+ "dependencies": { -+ "@heroku/socksv5": "^0.0.9", -+ "ssh2": "~1.14.0" -+ } -+ }, -+ "node_modules/@faker-js/faker": { -+ "version": "6.1.2", -+ "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-6.1.2.tgz", -+ "integrity": "sha512-QSvmexHCxeRUk1/yKmoEDaWB5Hohjvtim5g2JJwy8S/l0L4b3y/GxSpE6vN4SBoVGGahEQW21uqyRr7EofI35A==", ++ "node_modules/@jridgewell/resolve-uri": { ++ "version": "3.1.2", ++ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", ++ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", "engines": { - "node": ">=10.0.0" -+ "node": ">=14.0.0", -+ "npm": ">=6.0.0" ++ "node": ">=6.0.0" } }, - "node_modules/@electron/asar": { - "version": "3.2.10", -+ "node_modules/@floating-ui/core": { -+ "version": "1.6.7", -+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz", -+ "integrity": "sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g==", -+ "dependencies": { -+ "@floating-ui/utils": "^0.2.7" -+ } -+ }, -+ "node_modules/@floating-ui/dom": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.1.tgz", -+ "integrity": "sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw==", -+ "dependencies": { -+ "@floating-ui/core": "^1.1.0" -+ } -+ }, -+ "node_modules/@floating-ui/utils": { -+ "version": "0.2.7", -+ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz", -+ "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==" -+ }, -+ "node_modules/@heroku/socksv5": { -+ "version": "0.0.9", -+ "resolved": "https://registry.npmjs.org/@heroku/socksv5/-/socksv5-0.0.9.tgz", -+ "integrity": "sha512-bV8v7R/c0gNve8i7yPmZbcCTJUqRbCnMSvcegcMaz+ly+FoZf9i4+3MTjKsX+OZn9w0w1I6VJYQBcdM+yMWPQQ==", -+ "dependencies": { -+ "ip-address": "^5.8.8" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/@humanwhocodes/config-array": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", -+ "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", -+ "deprecated": "Use @eslint/config-array instead", - "dev": true, -- "license": "MIT", - "dependencies": { +- "dev": true, ++ "node_modules/@jridgewell/set-array": { ++ "version": "1.2.1", ++ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", ++ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", +- "dependencies": { - "commander": "^5.0.0", - "glob": "^7.1.6", -+ "@humanwhocodes/object-schema": "^1.2.0", -+ "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, +- "minimatch": "^3.0.4" +- }, - "bin": { - "asar": "bin/asar.js" - }, "engines": { - "node": ">=10.12.0" -+ "node": ">=10.10.0" ++ "node": ">=6.0.0" } }, - "node_modules/@electron/asar/node_modules/brace-expansion": { -+ "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, -- "license": "MIT", +- "version": "1.1.11", +- "dev": true, ++ "node_modules/@jridgewell/source-map": { ++ "version": "0.3.6", ++ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", ++ "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" ++ "@jridgewell/gen-mapping": "^0.3.5", ++ "@jridgewell/trace-mapping": "^0.3.25" } }, - "node_modules/@electron/asar/node_modules/minimatch": { -+ "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, +- "version": "3.1.2", +- "dev": true, - "license": "ISC", ++ "node_modules/@jridgewell/sourcemap-codec": { ++ "version": "1.5.0", ++ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", ++ "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", ++ "license": "MIT" ++ }, ++ "node_modules/@jridgewell/trace-mapping": { ++ "version": "0.3.25", ++ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", ++ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", ++ "license": "MIT", "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -2782,172 +2775,264 @@ - "node": "*" +- "brace-expansion": "^1.1.7" +- }, +- "engines": { +- "node": "*" ++ "@jridgewell/resolve-uri": "^3.1.0", ++ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@electron/get": { - "version": "2.0.3", - "license": "MIT", -- "dependencies": { ++ "node_modules/@leichtgewicht/ip-codec": { ++ "version": "2.0.5", ++ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", ++ "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@malept/cross-spawn-promise": { ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", ++ "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", ++ "dev": true, ++ "funding": [ ++ { ++ "type": "individual", ++ "url": "https://github.com/sponsors/malept" ++ }, ++ { ++ "type": "tidelift", ++ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" ++ } ++ ], ++ "license": "Apache-2.0", + "dependencies": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", @@ -3329,89 +3572,69 @@ index a38125e..a1067b0 100644 - "progress": "^2.0.3", - "semver": "^6.2.0", - "sumchecker": "^3.0.1" -- }, -- "engines": { ++ "cross-spawn": "^7.0.1" + }, + "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "global-agent": "^3.0.0" -- } -+ "node_modules/@humanwhocodes/object-schema": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", -+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", -+ "deprecated": "Use @eslint/object-schema instead", -+ "dev": true ++ "node": ">= 10" + } }, - "node_modules/@electron/notarize": { - "version": "2.2.1", -+ "node_modules/@hutson/parse-repository-url": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", -+ "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", ++ "node_modules/@malept/flatpak-bundler": { ++ "version": "0.4.0", ++ "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", ++ "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==", "dev": true, -- "license": "MIT", -- "dependencies": { -- "debug": "^4.1.1", + "license": "MIT", + "dependencies": { + "debug": "^4.1.1", - "fs-extra": "^9.0.1", - "promise-retry": "^2.0.1" -- }, ++ "fs-extra": "^9.0.0", ++ "lodash": "^4.17.15", ++ "tmp-promise": "^3.0.2" + }, "engines": { -- "node": ">= 10.0.0" -+ "node": ">=6.9.0" + "node": ">= 10.0.0" } }, - "node_modules/@electron/notarize/node_modules/fs-extra": { -- "version": "9.1.0", -- "dev": true, -- "license": "MIT", -+ "node_modules/@intlify/core-base": { -+ "version": "9.13.1", -+ "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz", -+ "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==", ++ "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { + "version": "9.1.0", ++ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", ++ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "license": "MIT", "dependencies": { -- "at-least-node": "^1.0.0", -- "graceful-fs": "^4.2.0", -- "jsonfile": "^6.0.1", -- "universalify": "^2.0.0" -+ "@intlify/message-compiler": "9.13.1", -+ "@intlify/shared": "9.13.1" - }, - "engines": { -- "node": ">=10" -+ "node": ">= 16" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/kazupon" +@@ -2828,8 +3244,10 @@ + "node": ">=10" } }, - "node_modules/@electron/notarize/node_modules/jsonfile": { -- "version": "6.1.0", -- "dev": true, -- "license": "MIT", -+ "node_modules/@intlify/message-compiler": { -+ "version": "9.13.1", -+ "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz", -+ "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==", ++ "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { + "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", ++ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", "dependencies": { -- "universalify": "^2.0.0" -+ "@intlify/shared": "9.13.1", -+ "source-map-js": "^1.0.2" - }, -- "optionalDependencies": { -- "graceful-fs": "^4.1.6" -- } -- }, +@@ -2839,1816 +3257,2225 @@ + "graceful-fs": "^4.1.6" + } + }, - "node_modules/@electron/notarize/node_modules/universalify": { -- "version": "2.0.1", -- "dev": true, -- "license": "MIT", ++ "node_modules/@malept/flatpak-bundler/node_modules/universalify": { + "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", ++ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", "engines": { -- "node": ">= 10.0.0" -+ "node": ">= 16" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/kazupon" + "node": ">= 10.0.0" } }, - "node_modules/@electron/osx-sign": { @@ -3430,222 +3653,103 @@ index a38125e..a1067b0 100644 - "electron-osx-flat": "bin/electron-osx-flat.js", - "electron-osx-sign": "bin/electron-osx-sign.js" - }, -+ "node_modules/@intlify/shared": { -+ "version": "9.13.1", -+ "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.13.1.tgz", -+ "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==", - "engines": { +- "engines": { - "node": ">=12.0.0" -+ "node": ">= 16" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/kazupon" - } +- } ++ "node_modules/@mdi/js": { ++ "version": "7.2.96", ++ "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.2.96.tgz", ++ "integrity": "sha512-paR9M9ZT7rKbh2boksNUynuSZMHhqRYnEZOm/KrZTjQ4/FzyhjLHuvw/8XYzP+E7fS4+/Ms/82EN1pl/OFsiIA==", ++ "license": "Apache-2.0" }, - "node_modules/@electron/osx-sign/node_modules/fs-extra": { - "version": "10.1.0", -+ "node_modules/@isaacs/cliui": { -+ "version": "8.0.2", -+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", -+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", ++ "node_modules/@nodelib/fs.scandir": { ++ "version": "2.1.5", ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", ++ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" -+ "string-width": "^5.1.2", -+ "string-width-cjs": "npm:string-width@^4.2.0", -+ "strip-ansi": "^7.0.1", -+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", -+ "wrap-ansi": "^8.1.0", -+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" ++ "@nodelib/fs.stat": "2.0.5", ++ "run-parallel": "^1.1.9" }, "engines": { - "node": ">=12" +- "node": ">=12" ++ "node": ">= 8" } }, - "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { - "version": "4.0.10", -+ "node_modules/@isaacs/cliui/node_modules/ansi-regex": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", -+ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", ++ "node_modules/@nodelib/fs.stat": { ++ "version": "2.0.5", ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", ++ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 8.0.0" -+ "node": ">=12" - }, - "funding": { +- }, +- "funding": { - "url": "https://github.com/sponsors/gjtorikian/" -+ "url": "https://github.com/chalk/ansi-regex?sponsor=1" ++ "node": ">= 8" } }, - "node_modules/@electron/osx-sign/node_modules/jsonfile": { - "version": "6.1.0", -+ "node_modules/@isaacs/cliui/node_modules/ansi-styles": { -+ "version": "6.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", -+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", -+ "dev": true, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/@isaacs/cliui/node_modules/emoji-regex": { -+ "version": "9.2.2", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", -+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", -+ "dev": true -+ }, -+ "node_modules/@isaacs/cliui/node_modules/string-width": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", -+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", ++ "node_modules/@nodelib/fs.walk": { ++ "version": "1.2.8", ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", ++ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "universalify": "^2.0.0" -+ "eastasianwidth": "^0.2.0", -+ "emoji-regex": "^9.2.2", -+ "strip-ansi": "^7.0.1" - }, +- }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" -+ "engines": { -+ "node": ">=12" ++ "@nodelib/fs.scandir": "2.1.5", ++ "fastq": "^1.6.0" + }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" ++ "engines": { ++ "node": ">= 8" } }, - "node_modules/@electron/osx-sign/node_modules/universalify": { - "version": "2.0.1", -+ "node_modules/@isaacs/cliui/node_modules/strip-ansi": { -+ "version": "7.1.0", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", -+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", ++ "node_modules/@pkgjs/parseargs": { ++ "version": "0.11.0", ++ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", ++ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, -- "license": "MIT", -+ "dependencies": { -+ "ansi-regex": "^6.0.1" -+ }, + "license": "MIT", ++ "optional": true, "engines": { - "node": ">= 10.0.0" -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, +- } +- }, - "node_modules/@electron/remote": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", - "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", - "peerDependencies": { - "electron": ">= 13.0.0" -+ "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { -+ "version": "8.1.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", -+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", -+ "dev": true, -+ "dependencies": { -+ "ansi-styles": "^6.1.0", -+ "string-width": "^5.0.1", -+ "strip-ansi": "^7.0.1" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" ++ "node": ">=14" } }, - "node_modules/@electron/universal": { - "version": "1.5.1", -+ "node_modules/@jamescoyle/vue-icon": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/@jamescoyle/vue-icon/-/vue-icon-0.1.2.tgz", -+ "integrity": "sha512-KFrImXx5TKIi6iQXlnyLEBl4rNosNKbTeRnr70ucTdUaciVmd9qK9d/pZAaKt1Ob/8xNnX2GMp8LisyHdKtEgw==" -+ }, -+ "node_modules/@jridgewell/gen-mapping": { -+ "version": "0.3.5", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", -+ "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", -+ "dependencies": { -+ "@jridgewell/set-array": "^1.2.1", -+ "@jridgewell/sourcemap-codec": "^1.4.10", -+ "@jridgewell/trace-mapping": "^0.3.24" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/resolve-uri": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", -+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/set-array": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", -+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/source-map": { -+ "version": "0.3.6", -+ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", -+ "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", -+ "dependencies": { -+ "@jridgewell/gen-mapping": "^0.3.5", -+ "@jridgewell/trace-mapping": "^0.3.25" -+ } -+ }, -+ "node_modules/@jridgewell/sourcemap-codec": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", -+ "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" -+ }, -+ "node_modules/@jridgewell/trace-mapping": { -+ "version": "0.3.25", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", -+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", -+ "dependencies": { -+ "@jridgewell/resolve-uri": "^3.1.0", -+ "@jridgewell/sourcemap-codec": "^1.4.14" -+ } -+ }, -+ "node_modules/@leichtgewicht/ip-codec": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", -+ "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", -+ "dev": true -+ }, -+ "node_modules/@malept/cross-spawn-promise": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", -+ "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", ++ "node_modules/@playwright/test": { ++ "version": "1.28.1", ++ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.1.tgz", ++ "integrity": "sha512-xN6spdqrNlwSn9KabIhqfZR7IWjPpFK1835tFNgjrlysaSezuX8PYUwaz38V/yI8TJLG9PkAMEXoHRXYXlpTPQ==", ++ "deprecated": "Please update to the latest version of Playwright to test up-to-date browsers.", "dev": true, - "license": "MIT", -+ "funding": [ -+ { -+ "type": "individual", -+ "url": "https://github.com/sponsors/malept" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" -+ } -+ ], ++ "license": "Apache-2.0", "dependencies": { - "@electron/asar": "^3.2.1", - "@malept/cross-spawn-promise": "^1.1.0", @@ -3654,64 +3758,78 @@ index a38125e..a1067b0 100644 - "fs-extra": "^9.0.1", - "minimatch": "^3.0.4", - "plist": "^3.0.4" -+ "cross-spawn": "^7.0.1" ++ "@types/node": "*", ++ "playwright-core": "1.28.1" ++ }, ++ "bin": { ++ "playwright": "cli.js" }, "engines": { - "node": ">=8.6" -+ "node": ">= 10" ++ "node": ">=14" } }, - "node_modules/@electron/universal/node_modules/brace-expansion": { - "version": "1.1.11", -+ "node_modules/@malept/flatpak-bundler": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", -+ "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==", - "dev": true, -- "license": "MIT", - "dependencies": { +- "dev": true, ++ "node_modules/@sindresorhus/is": { ++ "version": "4.6.0", ++ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", ++ "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "license": "MIT", +- "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -+ "debug": "^4.1.1", -+ "fs-extra": "^9.0.0", -+ "lodash": "^4.17.15", -+ "tmp-promise": "^3.0.2" -+ }, + "engines": { -+ "node": ">= 10.0.0" ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sindresorhus/is?sponsor=1" } }, - "node_modules/@electron/universal/node_modules/fs-extra": { -+ "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { - "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", -+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, -- "license": "MIT", +- "version": "9.1.0", +- "dev": true, ++ "node_modules/@szmarczak/http-timer": { ++ "version": "4.0.6", ++ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", ++ "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "license": "MIT", "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", -@@ -2958,10 +3043,11 @@ +- "at-least-node": "^1.0.0", +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" ++ "defer-to-connect": "^2.0.0" + }, + "engines": { "node": ">=10" } }, - "node_modules/@electron/universal/node_modules/jsonfile": { -+ "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { - "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", +- "version": "6.1.0", ++ "node_modules/@tootallnate/once": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", ++ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, -- "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, -@@ -2969,1077 +3055,1587 @@ - "graceful-fs": "^4.1.6" + "license": "MIT", +- "dependencies": { +- "universalify": "^2.0.0" +- }, +- "optionalDependencies": { +- "graceful-fs": "^4.1.6" ++ "engines": { ++ "node": ">= 10" } }, - "node_modules/@electron/universal/node_modules/minimatch": { - "version": "3.1.2", -- "dev": true, ++ "node_modules/@tsconfig/node10": { ++ "version": "1.0.11", ++ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", ++ "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" @@ -3719,31 +3837,50 @@ index a38125e..a1067b0 100644 - "engines": { - "node": "*" - } -- }, ++ "license": "MIT" + }, - "node_modules/@electron/universal/node_modules/universalify": { -+ "node_modules/@malept/flatpak-bundler/node_modules/universalify": { - "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", -+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", +- "version": "2.0.1", ++ "node_modules/@tsconfig/node12": { ++ "version": "1.0.11", ++ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", ++ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@tsconfig/node14": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", ++ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@tsconfig/node16": { ++ "version": "1.0.4", ++ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", ++ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "dev": true, -- "license": "MIT", - "engines": { - "node": ">= 10.0.0" ++ "license": "MIT" ++ }, ++ "node_modules/@turf/helpers": { ++ "version": "6.5.0", ++ "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz", ++ "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==", + "license": "MIT", +- "engines": { +- "node": ">= 10.0.0" ++ "funding": { ++ "url": "https://opencollective.com/turf" } }, - "node_modules/@eslint/eslintrc": { - "version": "0.4.3", -+ "node_modules/@mdi/js": { -+ "version": "7.2.96", -+ "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.2.96.tgz", -+ "integrity": "sha512-paR9M9ZT7rKbh2boksNUynuSZMHhqRYnEZOm/KrZTjQ4/FzyhjLHuvw/8XYzP+E7fS4+/Ms/82EN1pl/OFsiIA==" -+ }, -+ "node_modules/@nodelib/fs.scandir": { -+ "version": "2.1.5", -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", -+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", ++ "node_modules/@types/better-sqlite3": { ++ "version": "7.5.0", ++ "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.5.0.tgz", ++ "integrity": "sha512-G9ZbMjydW2yj1AgiPlUtdgF3a1qNpLJLudc9ynJCeJByS3XFWpmT9LT+VSHrKHFbxb31CvtYwetLTOvG9zdxdg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", @@ -3754,102 +3891,109 @@ index a38125e..a1067b0 100644 - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" -+ "@nodelib/fs.stat": "2.0.5", -+ "run-parallel": "^1.1.9" - }, - "engines": { +- }, +- "engines": { - "node": "^10.12.0 || >=12.0.0" -- } -- }, ++ "@types/node": "*" + } + }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "1.0.10", -- "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@types/body-parser": { ++ "version": "1.19.5", ++ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", ++ "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "dev": true, + "license": "MIT", + "dependencies": { - "sprintf-js": "~1.0.2" -+ "node": ">= 8" ++ "@types/connect": "*", ++ "@types/node": "*" } }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", -+ "node_modules/@nodelib/fs.stat": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", -+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", ++ "node_modules/@types/bonjour": { ++ "version": "3.5.13", ++ "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", ++ "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", "dev": true, -- "license": "MIT", -- "dependencies": { + "license": "MIT", + "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -+ "engines": { -+ "node": ">= 8" ++ "@types/node": "*" } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.23.0", -+ "node_modules/@nodelib/fs.walk": { -+ "version": "1.2.8", -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", -+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@types/cacheable-request": { ++ "version": "6.0.3", ++ "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", ++ "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "license": "MIT", "dependencies": { - "type-fest": "^0.20.2" -+ "@nodelib/fs.scandir": "2.1.5", -+ "fastq": "^1.6.0" - }, - "engines": { +- }, +- "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -+ "node": ">= 8" ++ "@types/http-cache-semantics": "*", ++ "@types/keyv": "^3.1.4", ++ "@types/node": "*", ++ "@types/responselike": "^1.0.0" } }, - "node_modules/@eslint/eslintrc/node_modules/ignore": { - "version": "4.0.6", -+ "node_modules/@pkgjs/parseargs": { -+ "version": "0.11.0", -+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", -+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", ++ "node_modules/@types/connect": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", ++ "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, -- "license": "MIT", -+ "optional": true, - "engines": { + "license": "MIT", +- "engines": { - "node": ">= 4" -+ "node": ">=14" ++ "dependencies": { ++ "@types/node": "*" } }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "3.14.1", -+ "node_modules/@playwright/test": { -+ "version": "1.28.1", -+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.1.tgz", -+ "integrity": "sha512-xN6spdqrNlwSn9KabIhqfZR7IWjPpFK1835tFNgjrlysaSezuX8PYUwaz38V/yI8TJLG9PkAMEXoHRXYXlpTPQ==", -+ "deprecated": "Please update to the latest version of Playwright to test up-to-date browsers.", ++ "node_modules/@types/connect-history-api-fallback": { ++ "version": "1.5.4", ++ "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", ++ "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" -+ "@types/node": "*", -+ "playwright-core": "1.28.1" - }, - "bin": { +- }, +- "bin": { - "js-yaml": "bin/js-yaml.js" -- } -- }, ++ "@types/express-serve-static-core": "*", ++ "@types/node": "*" + } + }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", -- "dev": true, ++ "node_modules/@types/conventional-commits-parser": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz", ++ "integrity": "sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==", + "dev": true, - "license": "ISC", -- "dependencies": { ++ "license": "MIT", + "dependencies": { - "brace-expansion": "^1.1.7" -+ "playwright": "cli.js" - }, - "engines": { +- }, +- "engines": { - "node": "*" -+ "node": ">=14" ++ "@types/node": "*" } }, - "node_modules/@eslint/eslintrc/node_modules/sprintf-js": { @@ -3859,125 +4003,176 @@ index a38125e..a1067b0 100644 - }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", -- "dev": true, ++ "node_modules/@types/debug": { ++ "version": "4.1.12", ++ "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", ++ "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", + "dev": true, - "license": "(MIT OR CC0-1.0)", -+ "node_modules/@sindresorhus/is": { -+ "version": "4.6.0", -+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", -+ "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "engines": { - "node": ">=10" - }, - "funding": { +- "engines": { +- "node": ">=10" +- }, +- "funding": { - "url": "https://github.com/sponsors/sindresorhus" -+ "url": "https://github.com/sindresorhus/is?sponsor=1" ++ "license": "MIT", ++ "dependencies": { ++ "@types/ms": "*" } }, - "node_modules/@fabio286/ssh2-promise": { - "version": "1.0.4b", -- "license": "MIT", -+ "node_modules/@szmarczak/http-timer": { -+ "version": "4.0.6", -+ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", -+ "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", ++ "node_modules/@types/estree": { ++ "version": "1.0.6", ++ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", ++ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", ++ "license": "MIT" ++ }, ++ "node_modules/@types/express": { ++ "version": "4.17.21", ++ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", ++ "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", ++ "dev": true, + "license": "MIT", "dependencies": { - "@heroku/socksv5": "^0.0.9", - "ssh2": "~1.14.0" -+ "defer-to-connect": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=10" ++ "@types/body-parser": "*", ++ "@types/express-serve-static-core": "^4.17.33", ++ "@types/qs": "*", ++ "@types/serve-static": "*" } }, - "node_modules/@faker-js/faker": { - "version": "6.1.2", -- "license": "MIT", -+ "node_modules/@tootallnate/once": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", -+ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", ++ "node_modules/@types/express-serve-static-core": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz", ++ "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==", + "dev": true, - "engines": { + "license": "MIT", +- "engines": { - "node": ">=14.0.0", - "npm": ">=6.0.0" -+ "node": ">= 10" ++ "dependencies": { ++ "@types/node": "*", ++ "@types/qs": "*", ++ "@types/range-parser": "*", ++ "@types/send": "*" } }, - "node_modules/@floating-ui/core": { - "version": "1.5.0", -- "license": "MIT", -- "dependencies": { ++ "node_modules/@types/express/node_modules/@types/express-serve-static-core": { ++ "version": "4.19.6", ++ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", ++ "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", ++ "dev": true, + "license": "MIT", + "dependencies": { - "@floating-ui/utils": "^0.1.3" -- } -+ "node_modules/@tsconfig/node10": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", -+ "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", -+ "dev": true ++ "@types/node": "*", ++ "@types/qs": "*", ++ "@types/range-parser": "*", ++ "@types/send": "*" + } }, - "node_modules/@floating-ui/dom": { - "version": "1.1.1", -- "license": "MIT", -- "dependencies": { ++ "node_modules/@types/fs-extra": { ++ "version": "9.0.13", ++ "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", ++ "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", ++ "dev": true, + "license": "MIT", + "dependencies": { - "@floating-ui/core": "^1.1.0" -- } -+ "node_modules/@tsconfig/node12": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", -+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", -+ "dev": true ++ "@types/node": "*" + } }, - "node_modules/@floating-ui/utils": { - "version": "0.1.6", -- "license": "MIT" -+ "node_modules/@tsconfig/node14": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", -+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", -+ "dev": true ++ "node_modules/@types/geojson": { ++ "version": "7946.0.14", ++ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", ++ "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==", ++ "dev": true, + "license": "MIT" }, - "node_modules/@heroku/socksv5": { - "version": "0.0.9", -- "license": "MIT", -- "dependencies": { ++ "node_modules/@types/glob": { ++ "version": "7.2.0", ++ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", ++ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", ++ "dev": true, + "license": "MIT", + "dependencies": { - "ip-address": "^5.8.8" - }, - "engines": { - "node": ">=0.10.0" -- } -+ "node_modules/@tsconfig/node16": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", -+ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", -+ "dev": true ++ "@types/minimatch": "*", ++ "@types/node": "*" + } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", -- "dev": true, ++ "node_modules/@types/html-minifier-terser": { ++ "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", ++ "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", ++ "license": "MIT" ++ }, ++ "node_modules/@types/http-cache-semantics": { ++ "version": "4.0.4", ++ "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", ++ "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", ++ "license": "MIT" ++ }, ++ "node_modules/@types/http-errors": { ++ "version": "2.0.4", ++ "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", ++ "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "dev": true, - "license": "Apache-2.0", -- "dependencies": { ++ "license": "MIT" ++ }, ++ "node_modules/@types/http-proxy": { ++ "version": "1.17.15", ++ "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz", ++ "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==", ++ "dev": true, ++ "license": "MIT", + "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.10.0" -+ "node_modules/@turf/helpers": { -+ "version": "6.5.0", -+ "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz", -+ "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==", -+ "funding": { -+ "url": "https://opencollective.com/turf" ++ "@types/node": "*" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", -+ "node_modules/@types/better-sqlite3": { -+ "version": "7.5.0", -+ "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.5.0.tgz", -+ "integrity": "sha512-G9ZbMjydW2yj1AgiPlUtdgF3a1qNpLJLudc9ynJCeJByS3XFWpmT9LT+VSHrKHFbxb31CvtYwetLTOvG9zdxdg==", ++ "node_modules/@types/json-schema": { ++ "version": "7.0.15", ++ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", ++ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", ++ "license": "MIT" ++ }, ++ "node_modules/@types/json5": { ++ "version": "0.0.29", ++ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", ++ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true, -- "license": "MIT", ++ "license": "MIT" ++ }, ++ "node_modules/@types/keyv": { ++ "version": "3.1.4", ++ "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", ++ "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" @@ -3986,43 +4181,49 @@ index a38125e..a1067b0 100644 }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", -+ "node_modules/@types/body-parser": { -+ "version": "1.19.5", -+ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", -+ "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", ++ "node_modules/@types/leaflet": { ++ "version": "1.7.11", ++ "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.11.tgz", ++ "integrity": "sha512-VwAYom2pfIAf/pLj1VR5aLltd4tOtHyvfaJlNYCoejzP2nu52PrMi1ehsLRMUS+bgafmIIKBV1cMfKeS+uJ0Vg==", "dev": true, - "license": "ISC", ++ "license": "MIT", "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" -+ "@types/connect": "*", -+ "@types/node": "*" ++ "@types/geojson": "*" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", -- "dev": true, ++ "node_modules/@types/marked": { ++ "version": "4.0.8", ++ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.8.tgz", ++ "integrity": "sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==", + "dev": true, - "license": "BSD-3-Clause" -- }, ++ "license": "MIT" + }, - "node_modules/@hutson/parse-repository-url": { - "version": "3.0.2", -+ "node_modules/@types/bonjour": { -+ "version": "3.5.13", -+ "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", -+ "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", ++ "node_modules/@types/mime": { ++ "version": "1.3.5", ++ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", ++ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=6.9.0" - } -- }, ++ "license": "MIT" + }, - "node_modules/@intlify/core-base": { - "version": "9.13.1", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz", - "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==", - "dependencies": { +- "dependencies": { - "@intlify/message-compiler": "9.13.1", - "@intlify/shared": "9.13.1" - }, @@ -4031,18 +4232,19 @@ index a38125e..a1067b0 100644 - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" -+ "@types/node": "*" - } +- } ++ "node_modules/@types/minimatch": { ++ "version": "5.1.2", ++ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", ++ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", ++ "dev": true, ++ "license": "MIT" }, - "node_modules/@intlify/message-compiler": { - "version": "9.13.1", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz", - "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==", -+ "node_modules/@types/cacheable-request": { -+ "version": "6.0.3", -+ "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", -+ "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", - "dependencies": { +- "dependencies": { - "@intlify/shared": "9.13.1", - "source-map-js": "^1.0.2" - }, @@ -4051,11 +4253,13 @@ index a38125e..a1067b0 100644 - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" -+ "@types/http-cache-semantics": "*", -+ "@types/keyv": "^3.1.4", -+ "@types/node": "*", -+ "@types/responselike": "^1.0.0" - } +- } ++ "node_modules/@types/minimist": { ++ "version": "1.2.5", ++ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", ++ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", ++ "dev": true, ++ "license": "MIT" }, - "node_modules/@intlify/shared": { - "version": "9.13.1", @@ -4066,23 +4270,29 @@ index a38125e..a1067b0 100644 - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" -+ "node_modules/@types/connect": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", -+ "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", +- } ++ "node_modules/@types/ms": { ++ "version": "0.7.34", ++ "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz", ++ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==", + "dev": true, -+ "dependencies": { -+ "@types/node": "*" - } ++ "license": "MIT" }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", -+ "node_modules/@types/connect-history-api-fallback": { -+ "version": "1.5.4", -+ "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", -+ "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", ++ "node_modules/@types/node": { ++ "version": "17.0.45", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", ++ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", ++ "license": "MIT" ++ }, ++ "node_modules/@types/node-forge": { ++ "version": "1.3.11", ++ "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", ++ "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", "dev": true, - "license": "ISC", ++ "license": "MIT", "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", @@ -4093,61 +4303,77 @@ index a38125e..a1067b0 100644 - }, - "engines": { - "node": ">=12" -+ "@types/express-serve-static-core": "*", + "@types/node": "*" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", -+ "node_modules/@types/conventional-commits-parser": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz", -+ "integrity": "sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==", ++ "node_modules/@types/normalize-package-data": { ++ "version": "2.4.4", ++ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", ++ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@types/pg": { ++ "version": "8.6.6", ++ "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.6.tgz", ++ "integrity": "sha512-O2xNmXebtwVekJDD+02udOncjVcMZQuTEQEMpKJ0ZRf5E7/9JJX3izhKUcUifBkyKpljyUM6BTgy2trmviKlpw==", "dev": true, -- "license": "MIT", + "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "dependencies": { -+ "@types/node": "*" ++ "@types/node": "*", ++ "pg-protocol": "*", ++ "pg-types": "^2.2.0" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", -+ "node_modules/@types/debug": { -+ "version": "4.1.12", -+ "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", -+ "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", ++ "node_modules/@types/plist": { ++ "version": "3.0.5", ++ "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", ++ "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==", "dev": true, -- "license": "MIT", + "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" ++ "optional": true, + "dependencies": { -+ "@types/ms": "*" ++ "@types/node": "*", ++ "xmlbuilder": ">=11.0.1" } }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", -- "dev": true, -- "license": "MIT" -+ "node_modules/@types/estree": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", -+ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" ++ "node_modules/@types/qs": { ++ "version": "6.9.16", ++ "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz", ++ "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==", + "dev": true, + "license": "MIT" }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", -+ "node_modules/@types/express": { -+ "version": "4.17.21", -+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", -+ "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", ++ "node_modules/@types/range-parser": { ++ "version": "1.2.7", ++ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", ++ "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", "dev": true, -- "license": "MIT", ++ "license": "MIT" ++ }, ++ "node_modules/@types/responselike": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", ++ "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", + "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", @@ -4158,20 +4384,30 @@ index a38125e..a1067b0 100644 - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -+ "@types/body-parser": "*", -+ "@types/express-serve-static-core": "^4.17.33", -+ "@types/qs": "*", -+ "@types/serve-static": "*" ++ "@types/node": "*" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", -+ "node_modules/@types/express-serve-static-core": { -+ "version": "4.19.5", -+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", -+ "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", ++ "node_modules/@types/retry": { ++ "version": "0.12.0", ++ "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", ++ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@types/semver": { ++ "version": "7.5.8", ++ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", ++ "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", ++ "license": "MIT" ++ }, ++ "node_modules/@types/send": { ++ "version": "0.17.4", ++ "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", ++ "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" - }, @@ -4180,20 +4416,18 @@ index a38125e..a1067b0 100644 - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" -+ "@types/node": "*", -+ "@types/qs": "*", -+ "@types/range-parser": "*", -+ "@types/send": "*" ++ "@types/mime": "^1", ++ "@types/node": "*" } }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", -+ "node_modules/@types/fs-extra": { -+ "version": "9.0.13", -+ "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", -+ "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", ++ "node_modules/@types/serve-index": { ++ "version": "1.9.4", ++ "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", ++ "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", @@ -4204,42 +4438,21 @@ index a38125e..a1067b0 100644 - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -+ "@types/node": "*" ++ "@types/express": "*" } }, - "node_modules/@jamescoyle/vue-icon": { - "version": "0.1.2", - "license": "MIT" -+ "node_modules/@types/geojson": { -+ "version": "7946.0.14", -+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", -+ "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==", -+ "dev": true - }, +- }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", -- "license": "MIT", -+ "node_modules/@types/html-minifier-terser": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", -+ "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==" -+ }, -+ "node_modules/@types/http-cache-semantics": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", -+ "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==" -+ }, -+ "node_modules/@types/http-errors": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", -+ "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", -+ "dev": true -+ }, -+ "node_modules/@types/http-proxy": { -+ "version": "1.17.15", -+ "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz", -+ "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==", ++ "node_modules/@types/serve-static": { ++ "version": "1.15.7", ++ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", ++ "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", @@ -4247,73 +4460,88 @@ index a38125e..a1067b0 100644 - }, - "engines": { - "node": ">=6.0.0" -+ "@types/node": "*" ++ "@types/http-errors": "*", ++ "@types/node": "*", ++ "@types/send": "*" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", -- "license": "MIT", ++ "node_modules/@types/sockjs": { ++ "version": "0.3.36", ++ "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", ++ "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", ++ "dev": true, + "license": "MIT", - "engines": { - "node": ">=6.0.0" -- } -+ "node_modules/@types/json-schema": { -+ "version": "7.0.15", -+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", -+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" ++ "dependencies": { ++ "@types/node": "*" + } }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", -- "license": "MIT", ++ "node_modules/@types/ssh2": { ++ "version": "1.11.19", ++ "resolved": "https://registry.npmjs.org/@types/ssh2/-/ssh2-1.11.19.tgz", ++ "integrity": "sha512-ydbQAqEcdNVy2t1w7dMh6eWMr+iOgtEkqM/3K9RMijMaok/ER7L8GW6PwsOypHCN++M+c8S/UR9SgMqNIFstbA==", ++ "dev": true, + "license": "MIT", - "engines": { - "node": ">=6.0.0" -- } -+ "node_modules/@types/json5": { -+ "version": "0.0.29", -+ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", -+ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", -+ "dev": true ++ "dependencies": { ++ "@types/node": "^18.11.18" + } }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.5", -- "license": "MIT", -+ "node_modules/@types/keyv": { -+ "version": "3.1.4", -+ "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", -+ "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", ++ "node_modules/@types/ssh2/node_modules/@types/node": { ++ "version": "18.19.57", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.57.tgz", ++ "integrity": "sha512-I2ioBd/IPrYDMv9UNR5NlPElOZ68QB7yY5V2EsLtSrTO0LM0PnCEFF9biLWHf5k+sIy4ohueCV9t4gk1AEdlVA==", ++ "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" -+ "@types/node": "*" ++ "undici-types": "~5.26.4" } }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", -- "license": "MIT" -- }, ++ "node_modules/@types/verror": { ++ "version": "1.10.10", ++ "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz", ++ "integrity": "sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==", ++ "dev": true, ++ "license": "MIT", ++ "optional": true ++ }, ++ "node_modules/@types/web-bluetooth": { ++ "version": "0.0.17", ++ "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz", ++ "integrity": "sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==", + "license": "MIT" + }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.20", -- "license": "MIT", -+ "node_modules/@types/leaflet": { -+ "version": "1.7.11", -+ "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.11.tgz", -+ "integrity": "sha512-VwAYom2pfIAf/pLj1VR5aLltd4tOtHyvfaJlNYCoejzP2nu52PrMi1ehsLRMUS+bgafmIIKBV1cMfKeS+uJ0Vg==", ++ "node_modules/@types/ws": { ++ "version": "8.5.12", ++ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", ++ "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" -+ "@types/geojson": "*" ++ "@types/node": "*" } }, - "node_modules/@leichtgewicht/ip-codec": { - "version": "2.0.4", - "dev": true, - "license": "MIT" -+ "node_modules/@types/marked": { -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.8.tgz", -+ "integrity": "sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==", -+ "dev": true - }, +- }, - "node_modules/@malept/cross-spawn-promise": { - "version": "1.1.1", - "dev": true, @@ -4328,334 +4556,33 @@ index a38125e..a1067b0 100644 - } - ], - "license": "Apache-2.0", -- "dependencies": { -- "cross-spawn": "^7.0.1" -- }, -- "engines": { -- "node": ">= 10" -- } -+ "node_modules/@types/mime": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", -+ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", -+ "dev": true - }, -- "node_modules/@malept/flatpak-bundler": { -- "version": "0.4.0", -+ "node_modules/@types/minimist": { -+ "version": "1.2.5", -+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", -+ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", -+ "dev": true -+ }, -+ "node_modules/@types/ms": { -+ "version": "0.7.34", -+ "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz", -+ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==", -+ "dev": true -+ }, -+ "node_modules/@types/node": { -+ "version": "17.0.45", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", -+ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" -+ }, -+ "node_modules/@types/node-forge": { -+ "version": "1.3.11", -+ "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", -+ "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "debug": "^4.1.1", -- "fs-extra": "^9.0.0", -- "lodash": "^4.17.15", -- "tmp-promise": "^3.0.2" -- }, -- "engines": { -- "node": ">= 10.0.0" -+ "@types/node": "*" - } - }, -- "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { -- "version": "9.1.0", -+ "node_modules/@types/normalize-package-data": { -+ "version": "2.4.4", -+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", -+ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", -+ "dev": true -+ }, -+ "node_modules/@types/pg": { -+ "version": "8.6.6", -+ "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.6.tgz", -+ "integrity": "sha512-O2xNmXebtwVekJDD+02udOncjVcMZQuTEQEMpKJ0ZRf5E7/9JJX3izhKUcUifBkyKpljyUM6BTgy2trmviKlpw==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "at-least-node": "^1.0.0", -- "graceful-fs": "^4.2.0", -- "jsonfile": "^6.0.1", -- "universalify": "^2.0.0" -- }, -- "engines": { -- "node": ">=10" -+ "@types/node": "*", -+ "pg-protocol": "*", -+ "pg-types": "^2.2.0" - } - }, -- "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { -- "version": "6.1.0", -+ "node_modules/@types/plist": { -+ "version": "3.0.5", -+ "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", -+ "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==", - "dev": true, -- "license": "MIT", -+ "optional": true, - "dependencies": { -- "universalify": "^2.0.0" -- }, -- "optionalDependencies": { -- "graceful-fs": "^4.1.6" -+ "@types/node": "*", -+ "xmlbuilder": ">=11.0.1" - } - }, -- "node_modules/@malept/flatpak-bundler/node_modules/universalify": { -- "version": "2.0.1", -- "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">= 10.0.0" -- } -+ "node_modules/@types/qs": { -+ "version": "6.9.15", -+ "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", -+ "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", -+ "dev": true - }, -- "node_modules/@mdi/js": { -- "version": "7.2.96", -- "license": "Apache-2.0" -+ "node_modules/@types/range-parser": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", -+ "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", -+ "dev": true - }, -- "node_modules/@nodelib/fs.scandir": { -- "version": "2.1.5", -- "dev": true, -- "license": "MIT", -+ "node_modules/@types/responselike": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", -+ "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", - "dependencies": { -- "@nodelib/fs.stat": "2.0.5", -- "run-parallel": "^1.1.9" -- }, -- "engines": { -- "node": ">= 8" -+ "@types/node": "*" - } - }, -- "node_modules/@nodelib/fs.stat": { -- "version": "2.0.5", -- "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">= 8" -- } -+ "node_modules/@types/retry": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", -+ "dev": true - }, -- "node_modules/@nodelib/fs.walk": { -- "version": "1.2.8", -+ "node_modules/@types/semver": { -+ "version": "7.5.8", -+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", -+ "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==" -+ }, -+ "node_modules/@types/send": { -+ "version": "0.17.4", -+ "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", -+ "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "@nodelib/fs.scandir": "2.1.5", -- "fastq": "^1.6.0" -- }, -- "engines": { -- "node": ">= 8" -+ "@types/mime": "^1", -+ "@types/node": "*" - } - }, -- "node_modules/@pkgjs/parseargs": { -- "version": "0.11.0", -+ "node_modules/@types/serve-index": { -+ "version": "1.9.4", -+ "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", -+ "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", - "dev": true, -- "license": "MIT", -- "optional": true, -- "engines": { -- "node": ">=14" -+ "dependencies": { -+ "@types/express": "*" - } - }, -- "node_modules/@playwright/test": { -- "version": "1.28.1", -+ "node_modules/@types/serve-static": { -+ "version": "1.15.7", -+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", -+ "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", - "dev": true, -- "license": "Apache-2.0", - "dependencies": { -+ "@types/http-errors": "*", - "@types/node": "*", -- "playwright-core": "1.28.1" -- }, -- "bin": { -- "playwright": "cli.js" -- }, -- "engines": { -- "node": ">=14" -- } -- }, -- "node_modules/@sindresorhus/is": { -- "version": "4.6.0", -- "license": "MIT", -- "engines": { -- "node": ">=10" -- }, -- "funding": { -- "url": "https://github.com/sindresorhus/is?sponsor=1" -+ "@types/send": "*" - } - }, -- "node_modules/@szmarczak/http-timer": { -- "version": "4.0.6", -- "license": "MIT", -+ "node_modules/@types/sockjs": { -+ "version": "0.3.36", -+ "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", -+ "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", -+ "dev": true, - "dependencies": { -- "defer-to-connect": "^2.0.0" -- }, -- "engines": { -- "node": ">=10" -+ "@types/node": "*" - } - }, -- "node_modules/@tootallnate/once": { -- "version": "2.0.0", -+ "node_modules/@types/ssh2": { -+ "version": "1.11.19", -+ "resolved": "https://registry.npmjs.org/@types/ssh2/-/ssh2-1.11.19.tgz", -+ "integrity": "sha512-ydbQAqEcdNVy2t1w7dMh6eWMr+iOgtEkqM/3K9RMijMaok/ER7L8GW6PwsOypHCN++M+c8S/UR9SgMqNIFstbA==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">= 10" -+ "dependencies": { -+ "@types/node": "^18.11.18" - } - }, -- "node_modules/@tsconfig/node10": { -- "version": "1.0.9", -- "dev": true, -- "license": "MIT" -- }, -- "node_modules/@tsconfig/node12": { -- "version": "1.0.11", -- "dev": true, -- "license": "MIT" -- }, -- "node_modules/@tsconfig/node14": { -- "version": "1.0.3", -+ "node_modules/@types/ssh2/node_modules/@types/node": { -+ "version": "18.19.46", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.46.tgz", -+ "integrity": "sha512-vnRgMS7W6cKa1/0G3/DTtQYpVrZ8c0Xm6UkLaVFrb9jtcVC3okokW09Ki1Qdrj9ISokszD69nY4WDLRlvHlhAA==", - "dev": true, -- "license": "MIT" -+ "dependencies": { -+ "undici-types": "~5.26.4" -+ } - }, -- "node_modules/@tsconfig/node16": { -- "version": "1.0.4", -+ "node_modules/@types/verror": { -+ "version": "1.10.10", -+ "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz", -+ "integrity": "sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==", - "dev": true, -- "license": "MIT" -+ "optional": true - }, -- "node_modules/@turf/helpers": { -- "version": "6.5.0", -- "license": "MIT", -- "funding": { -- "url": "https://opencollective.com/turf" -- } -+ "node_modules/@types/web-bluetooth": { -+ "version": "0.0.17", -+ "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz", -+ "integrity": "sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==" - }, -- "node_modules/@types/better-sqlite3": { -- "version": "7.5.0", -+ "node_modules/@types/ws": { -+ "version": "8.5.12", -+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", -+ "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", - "dev": true, -- "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, -- "node_modules/@types/body-parser": { -- "version": "1.19.5", -- "dev": true, -- "license": "MIT", + "node_modules/@types/yauzl": { + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", ++ "license": "MIT", + "optional": true, "dependencies": { -- "@types/connect": "*", - "@types/node": "*" +- "cross-spawn": "^7.0.1" +- }, +- "engines": { +- "node": ">= 10" ++ "@types/node": "*" } }, -- "node_modules/@types/bonjour": { -- "version": "3.5.13", +- "node_modules/@malept/flatpak-bundler": { +- "version": "0.4.0", + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz", + "integrity": "sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { -- "@types/node": "*" -- } -- }, -- "node_modules/@types/cacheable-request": { -- "version": "6.0.3", -- "license": "MIT", +- "debug": "^4.1.1", +- "fs-extra": "^9.0.0", +- "lodash": "^4.17.15", +- "tmp-promise": "^3.0.2" + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/type-utils": "5.18.0", + "@typescript-eslint/utils": "5.18.0", @@ -4665,8 +4592,9 @@ index a38125e..a1067b0 100644 + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 10.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { @@ -4681,35 +4609,47 @@ index a38125e..a1067b0 100644 + "typescript": { + "optional": true + } -+ } -+ }, + } + }, +- "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { +- "version": "9.1.0", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", -+ "dev": true, + "dev": true, +- "license": "MIT", +- "dependencies": { +- "at-least-node": "^1.0.0", +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" ++ "license": "ISC", + "bin": { + "semver": "bin/semver.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, + }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { +- "version": "6.1.0", + "node_modules/@typescript-eslint/parser": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz", + "integrity": "sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==", -+ "dev": true, + "dev": true, +- "license": "MIT", ++ "license": "BSD-2-Clause", "dependencies": { -- "@types/http-cache-semantics": "*", -- "@types/keyv": "^3.1.4", -- "@types/node": "*", -- "@types/responselike": "^1.0.0" +- "universalify": "^2.0.0" + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/typescript-estree": "5.18.0", + "debug": "^4.3.2" -+ }, + }, +- "optionalDependencies": { +- "graceful-fs": "^4.1.6" + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, @@ -4726,38 +4666,48 @@ index a38125e..a1067b0 100644 + } } }, -- "node_modules/@types/connect": { -- "version": "3.4.38", +- "node_modules/@malept/flatpak-bundler/node_modules/universalify": { +- "version": "2.0.1", + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz", + "integrity": "sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==", "dev": true, -- "license": "MIT", - "dependencies": { -- "@types/node": "*" + "license": "MIT", ++ "dependencies": { + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/visitor-keys": "5.18.0" + }, -+ "engines": { + "engines": { +- "node": ">= 10.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" -+ } -+ }, + } + }, +- "node_modules/@mdi/js": { +- "version": "7.2.96", +- "license": "Apache-2.0" +- }, +- "node_modules/@nodelib/fs.scandir": { +- "version": "2.1.5", + "node_modules/@typescript-eslint/type-utils": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz", + "integrity": "sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==", -+ "dev": true, -+ "dependencies": { + "dev": true, + "license": "MIT", + "dependencies": { +- "@nodelib/fs.stat": "2.0.5", +- "run-parallel": "^1.1.9" + "@typescript-eslint/utils": "5.18.0", + "debug": "^4.3.2", + "tsutils": "^3.21.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 8" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { @@ -4771,27 +4721,37 @@ index a38125e..a1067b0 100644 + "typescript": { + "optional": true + } -+ } -+ }, + } + }, +- "node_modules/@nodelib/fs.stat": { +- "version": "2.0.5", + "node_modules/@typescript-eslint/types": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz", + "integrity": "sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==", -+ "dev": true, -+ "engines": { + "dev": true, + "license": "MIT", + "engines": { +- "node": ">= 8" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" -+ } -+ }, + } + }, +- "node_modules/@nodelib/fs.walk": { +- "version": "1.2.8", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz", + "integrity": "sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==", -+ "dev": true, -+ "dependencies": { + "dev": true, +- "license": "MIT", ++ "license": "BSD-2-Clause", + "dependencies": { +- "@nodelib/fs.scandir": "2.1.5", +- "fastq": "^1.6.0" + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/visitor-keys": "5.18.0", + "debug": "^4.3.2", @@ -4799,8 +4759,18 @@ index a38125e..a1067b0 100644 + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 8" +- } +- }, +- "node_modules/@pkgjs/parseargs": { +- "version": "0.11.0", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "engines": { +- "node": ">=14" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { @@ -4811,25 +4781,38 @@ index a38125e..a1067b0 100644 + "typescript": { + "optional": true + } -+ } -+ }, + } + }, +- "node_modules/@playwright/test": { +- "version": "1.28.1", + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", -+ "dev": true, -+ "bin": { + "dev": true, +- "license": "Apache-2.0", +- "dependencies": { +- "@types/node": "*", +- "playwright-core": "1.28.1" +- }, ++ "license": "ISC", + "bin": { +- "playwright": "cli.js" + "semver": "bin/semver.js" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=14" + "node": ">=10" -+ } -+ }, + } + }, +- "node_modules/@sindresorhus/is": { +- "version": "4.6.0", + "node_modules/@typescript-eslint/utils": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz", + "integrity": "sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.18.0", @@ -4838,71 +4821,125 @@ index a38125e..a1067b0 100644 + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, -+ "engines": { + "engines": { +- "node": ">=10" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sindresorhus/is?sponsor=1" + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" -+ } -+ }, + } + }, +- "node_modules/@szmarczak/http-timer": { +- "version": "4.0.6", + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz", + "integrity": "sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==", + "dev": true, -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "defer-to-connect": "^2.0.0" + "@typescript-eslint/types": "5.18.0", + "eslint-visitor-keys": "^3.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=10" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" -+ } -+ }, + } + }, +- "node_modules/@tootallnate/once": { +- "version": "2.0.0", + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", -+ "dev": true, -+ "engines": { + "dev": true, +- "license": "MIT", ++ "license": "Apache-2.0", + "engines": { +- "node": ">= 10" +- } +- }, +- "node_modules/@tsconfig/node10": { +- "version": "1.0.9", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/@tsconfig/node12": { +- "version": "1.0.11", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/@tsconfig/node14": { +- "version": "1.0.3", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/@tsconfig/node16": { +- "version": "1.0.4", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/@turf/helpers": { +- "version": "6.5.0", +- "license": "MIT", + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, -+ "funding": { + "funding": { +- "url": "https://opencollective.com/turf" + "url": "https://opencollective.com/eslint" -+ } -+ }, + } + }, +- "node_modules/@types/better-sqlite3": { +- "version": "7.5.0", +- "dev": true, + "node_modules/@vue/compiler-core": { + "version": "3.2.47", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz", + "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "@types/node": "*" + "@babel/parser": "^7.16.4", + "@vue/shared": "3.2.47", + "estree-walker": "^2.0.2", + "source-map": "^0.6.1" -+ } -+ }, + } + }, +- "node_modules/@types/body-parser": { +- "version": "1.19.5", +- "dev": true, + "node_modules/@vue/compiler-dom": { + "version": "3.2.47", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz", + "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "@types/connect": "*", +- "@types/node": "*" + "@vue/compiler-core": "3.2.47", + "@vue/shared": "3.2.47" -+ } -+ }, + } + }, +- "node_modules/@types/bonjour": { +- "version": "3.5.13", +- "dev": true, + "node_modules/@vue/compiler-sfc": { + "version": "3.2.47", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz", + "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "@types/node": "*" + "@babel/parser": "^7.16.4", + "@vue/compiler-core": "3.2.47", + "@vue/compiler-dom": "3.2.47", @@ -4913,436 +4950,176 @@ index a38125e..a1067b0 100644 + "magic-string": "^0.25.7", + "postcss": "^8.1.10", + "source-map": "^0.6.1" -+ } -+ }, + } + }, +- "node_modules/@types/cacheable-request": { +- "version": "6.0.3", + "node_modules/@vue/compiler-ssr": { + "version": "3.2.47", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz", + "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "@types/http-cache-semantics": "*", +- "@types/keyv": "^3.1.4", +- "@types/node": "*", +- "@types/responselike": "^1.0.0" + "@vue/compiler-dom": "3.2.47", + "@vue/shared": "3.2.47" -+ } -+ }, + } + }, +- "node_modules/@types/connect": { + "node_modules/@vue/devtools-api": { -+ "version": "6.6.3", -+ "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.3.tgz", -+ "integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==" ++ "version": "6.6.4", ++ "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz", ++ "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==", ++ "license": "MIT" + }, + "node_modules/@vue/reactivity": { -+ "version": "3.4.38", + "version": "3.4.38", +- "dev": true, + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.38.tgz", + "integrity": "sha512-4vl4wMMVniLsSYYeldAKzbk72+D3hUnkw9z8lDeJacTxAkXeDAP1uE9xr2+aKIN0ipOL8EG2GPouVTH6yF7Gnw==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "@types/node": "*" + "@vue/shared": "3.4.38" -+ } -+ }, -+ "node_modules/@vue/reactivity-transform": { -+ "version": "3.2.47", -+ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz", -+ "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==", -+ "dependencies": { -+ "@babel/parser": "^7.16.4", -+ "@vue/compiler-core": "3.2.47", -+ "@vue/shared": "3.2.47", -+ "estree-walker": "^2.0.2", -+ "magic-string": "^0.25.7" -+ } -+ }, -+ "node_modules/@vue/reactivity/node_modules/@vue/shared": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", -+ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==" -+ }, -+ "node_modules/@vue/runtime-core": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.38.tgz", -+ "integrity": "sha512-21z3wA99EABtuf+O3IhdxP0iHgkBs1vuoCAsCKLVJPEjpVqvblwBnTj42vzHRlWDCyxu9ptDm7sI2ZMcWrQqlA==", -+ "dependencies": { -+ "@vue/reactivity": "3.4.38", -+ "@vue/shared": "3.4.38" -+ } -+ }, -+ "node_modules/@vue/runtime-core/node_modules/@vue/shared": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", -+ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==" -+ }, -+ "node_modules/@vue/runtime-dom": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.38.tgz", -+ "integrity": "sha512-afZzmUreU7vKwKsV17H1NDThEEmdYI+GCAK/KY1U957Ig2NATPVjCROv61R19fjZNzMmiU03n79OMnXyJVN0UA==", -+ "dependencies": { -+ "@vue/reactivity": "3.4.38", -+ "@vue/runtime-core": "3.4.38", -+ "@vue/shared": "3.4.38", -+ "csstype": "^3.1.3" -+ } -+ }, -+ "node_modules/@vue/runtime-dom/node_modules/@vue/shared": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", -+ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==" -+ }, -+ "node_modules/@vue/server-renderer": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.38.tgz", -+ "integrity": "sha512-NggOTr82FbPEkkUvBm4fTGcwUY8UuTsnWC/L2YZBmvaQ4C4Jl/Ao4HHTB+l7WnFCt5M/dN3l0XLuyjzswGYVCA==", -+ "dependencies": { -+ "@vue/compiler-ssr": "3.4.38", -+ "@vue/shared": "3.4.38" -+ }, -+ "peerDependencies": { -+ "vue": "3.4.38" -+ } -+ }, -+ "node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.38.tgz", -+ "integrity": "sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==", -+ "dependencies": { -+ "@babel/parser": "^7.24.7", -+ "@vue/shared": "3.4.38", -+ "entities": "^4.5.0", -+ "estree-walker": "^2.0.2", -+ "source-map-js": "^1.2.0" -+ } -+ }, -+ "node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz", -+ "integrity": "sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==", -+ "dependencies": { -+ "@vue/compiler-core": "3.4.38", -+ "@vue/shared": "3.4.38" -+ } -+ }, -+ "node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.38.tgz", -+ "integrity": "sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==", -+ "dependencies": { -+ "@vue/compiler-dom": "3.4.38", -+ "@vue/shared": "3.4.38" -+ } -+ }, -+ "node_modules/@vue/server-renderer/node_modules/@vue/shared": { -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", -+ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==" -+ }, -+ "node_modules/@vue/shared": { -+ "version": "3.2.47", -+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz", -+ "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==" -+ }, -+ "node_modules/@vueuse/core": { -+ "version": "10.4.1", -+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.4.1.tgz", -+ "integrity": "sha512-DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg==", -+ "dependencies": { -+ "@types/web-bluetooth": "^0.0.17", -+ "@vueuse/metadata": "10.4.1", -+ "@vueuse/shared": "10.4.1", -+ "vue-demi": ">=0.14.5" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/antfu" -+ } -+ }, -+ "node_modules/@vueuse/core/node_modules/vue-demi": { -+ "version": "0.14.10", -+ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", -+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", -+ "hasInstallScript": true, -+ "bin": { -+ "vue-demi-fix": "bin/vue-demi-fix.js", -+ "vue-demi-switch": "bin/vue-demi-switch.js" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/antfu" -+ }, -+ "peerDependencies": { -+ "@vue/composition-api": "^1.0.0-rc.1", -+ "vue": "^3.0.0-0 || ^2.6.0" -+ }, -+ "peerDependenciesMeta": { -+ "@vue/composition-api": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@vueuse/metadata": { -+ "version": "10.4.1", -+ "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.4.1.tgz", -+ "integrity": "sha512-2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg==", -+ "funding": { -+ "url": "https://github.com/sponsors/antfu" -+ } -+ }, -+ "node_modules/@vueuse/shared": { -+ "version": "10.4.1", -+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.4.1.tgz", -+ "integrity": "sha512-vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg==", -+ "dependencies": { -+ "vue-demi": ">=0.14.5" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/antfu" -+ } -+ }, -+ "node_modules/@vueuse/shared/node_modules/vue-demi": { -+ "version": "0.14.10", -+ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", -+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", -+ "hasInstallScript": true, -+ "bin": { -+ "vue-demi-fix": "bin/vue-demi-fix.js", -+ "vue-demi-switch": "bin/vue-demi-switch.js" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/antfu" -+ }, -+ "peerDependencies": { -+ "@vue/composition-api": "^1.0.0-rc.1", -+ "vue": "^3.0.0-0 || ^2.6.0" -+ }, -+ "peerDependenciesMeta": { -+ "@vue/composition-api": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@webassemblyjs/ast": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", -+ "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", -+ "dependencies": { -+ "@webassemblyjs/helper-numbers": "1.11.6", -+ "@webassemblyjs/helper-wasm-bytecode": "1.11.6" -+ } -+ }, -+ "node_modules/@webassemblyjs/floating-point-hex-parser": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", -+ "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" -+ }, -+ "node_modules/@webassemblyjs/helper-api-error": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", -+ "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" -+ }, -+ "node_modules/@webassemblyjs/helper-buffer": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", -+ "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==" -+ }, -+ "node_modules/@webassemblyjs/helper-numbers": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", -+ "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", -+ "dependencies": { -+ "@webassemblyjs/floating-point-hex-parser": "1.11.6", -+ "@webassemblyjs/helper-api-error": "1.11.6", -+ "@xtuc/long": "4.2.2" -+ } -+ }, -+ "node_modules/@webassemblyjs/helper-wasm-bytecode": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", -+ "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" -+ }, -+ "node_modules/@webassemblyjs/helper-wasm-section": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", -+ "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", -+ "dependencies": { -+ "@webassemblyjs/ast": "1.12.1", -+ "@webassemblyjs/helper-buffer": "1.12.1", -+ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", -+ "@webassemblyjs/wasm-gen": "1.12.1" -+ } -+ }, -+ "node_modules/@webassemblyjs/ieee754": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", -+ "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", -+ "dependencies": { -+ "@xtuc/ieee754": "^1.2.0" -+ } -+ }, -+ "node_modules/@webassemblyjs/leb128": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", -+ "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", -+ "dependencies": { -+ "@xtuc/long": "4.2.2" -+ } -+ }, -+ "node_modules/@webassemblyjs/utf8": { -+ "version": "1.11.6", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", -+ "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" -+ }, -+ "node_modules/@webassemblyjs/wasm-edit": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", -+ "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", -+ "dependencies": { -+ "@webassemblyjs/ast": "1.12.1", -+ "@webassemblyjs/helper-buffer": "1.12.1", -+ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", -+ "@webassemblyjs/helper-wasm-section": "1.12.1", -+ "@webassemblyjs/wasm-gen": "1.12.1", -+ "@webassemblyjs/wasm-opt": "1.12.1", -+ "@webassemblyjs/wasm-parser": "1.12.1", -+ "@webassemblyjs/wast-printer": "1.12.1" } }, - "node_modules/@types/connect-history-api-fallback": { - "version": "1.5.4", - "dev": true, -- "license": "MIT", -+ "node_modules/@webassemblyjs/wasm-gen": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", -+ "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", ++ "node_modules/@vue/reactivity-transform": { ++ "version": "3.2.47", ++ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz", ++ "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==", + "license": "MIT", "dependencies": { - "@types/express-serve-static-core": "*", - "@types/node": "*" -+ "@webassemblyjs/ast": "1.12.1", -+ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", -+ "@webassemblyjs/ieee754": "1.11.6", -+ "@webassemblyjs/leb128": "1.11.6", -+ "@webassemblyjs/utf8": "1.11.6" ++ "@babel/parser": "^7.16.4", ++ "@vue/compiler-core": "3.2.47", ++ "@vue/shared": "3.2.47", ++ "estree-walker": "^2.0.2", ++ "magic-string": "^0.25.7" } }, - "node_modules/@types/conventional-commits-parser": { - "version": "5.0.0", - "dev": true, - "license": "MIT", -+ "node_modules/@webassemblyjs/wasm-opt": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", -+ "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", - "dependencies": { +- "dependencies": { - "@types/node": "*" -+ "@webassemblyjs/ast": "1.12.1", -+ "@webassemblyjs/helper-buffer": "1.12.1", -+ "@webassemblyjs/wasm-gen": "1.12.1", -+ "@webassemblyjs/wasm-parser": "1.12.1" - } +- } ++ "node_modules/@vue/reactivity/node_modules/@vue/shared": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", ++ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==", ++ "license": "MIT" }, - "node_modules/@types/debug": { - "version": "4.1.12", - "dev": true, -- "license": "MIT", -+ "node_modules/@webassemblyjs/wasm-parser": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", -+ "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", ++ "node_modules/@vue/runtime-core": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.38.tgz", ++ "integrity": "sha512-21z3wA99EABtuf+O3IhdxP0iHgkBs1vuoCAsCKLVJPEjpVqvblwBnTj42vzHRlWDCyxu9ptDm7sI2ZMcWrQqlA==", + "license": "MIT", "dependencies": { - "@types/ms": "*" -+ "@webassemblyjs/ast": "1.12.1", -+ "@webassemblyjs/helper-api-error": "1.11.6", -+ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", -+ "@webassemblyjs/ieee754": "1.11.6", -+ "@webassemblyjs/leb128": "1.11.6", -+ "@webassemblyjs/utf8": "1.11.6" ++ "@vue/reactivity": "3.4.38", ++ "@vue/shared": "3.4.38" } }, - "node_modules/@types/eslint": { - "version": "8.44.7", - "license": "MIT", -+ "node_modules/@webassemblyjs/wast-printer": { -+ "version": "1.12.1", -+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", -+ "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", - "dependencies": { +- "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" -+ "@webassemblyjs/ast": "1.12.1", -+ "@xtuc/long": "4.2.2" - } +- } ++ "node_modules/@vue/runtime-core/node_modules/@vue/shared": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", ++ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==", ++ "license": "MIT" }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", -- "license": "MIT", -- "dependencies": { ++ "node_modules/@vue/runtime-dom": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.38.tgz", ++ "integrity": "sha512-afZzmUreU7vKwKsV17H1NDThEEmdYI+GCAK/KY1U957Ig2NATPVjCROv61R19fjZNzMmiU03n79OMnXyJVN0UA==", + "license": "MIT", + "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" -+ "node_modules/@webpack-cli/configtest": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", -+ "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", -+ "peerDependencies": { -+ "webpack": "4.x.x || 5.x.x", -+ "webpack-cli": "4.x.x" ++ "@vue/reactivity": "3.4.38", ++ "@vue/runtime-core": "3.4.38", ++ "@vue/shared": "3.4.38", ++ "csstype": "^3.1.3" } }, - "node_modules/@types/estree": { - "version": "1.0.5", -- "license": "MIT" -- }, ++ "node_modules/@vue/runtime-dom/node_modules/@vue/shared": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", ++ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==", + "license": "MIT" + }, - "node_modules/@types/express": { - "version": "4.17.21", - "dev": true, -- "license": "MIT", -+ "node_modules/@webpack-cli/info": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", -+ "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", ++ "node_modules/@vue/server-renderer": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.38.tgz", ++ "integrity": "sha512-NggOTr82FbPEkkUvBm4fTGcwUY8UuTsnWC/L2YZBmvaQ4C4Jl/Ao4HHTB+l7WnFCt5M/dN3l0XLuyjzswGYVCA==", + "license": "MIT", "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", - "@types/serve-static": "*" -+ "envinfo": "^7.7.3" ++ "@vue/compiler-ssr": "3.4.38", ++ "@vue/shared": "3.4.38" + }, + "peerDependencies": { -+ "webpack-cli": "4.x.x" ++ "vue": "3.4.38" } }, - "node_modules/@types/express-serve-static-core": { - "version": "4.17.41", - "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.38.tgz", ++ "integrity": "sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==", + "license": "MIT", + "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" -+ "node_modules/@webpack-cli/serve": { -+ "version": "1.7.0", -+ "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", -+ "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", -+ "peerDependencies": { -+ "webpack-cli": "4.x.x" -+ }, -+ "peerDependenciesMeta": { -+ "webpack-dev-server": { -+ "optional": true -+ } ++ "@babel/parser": "^7.24.7", ++ "@vue/shared": "3.4.38", ++ "entities": "^4.5.0", ++ "estree-walker": "^2.0.2", ++ "source-map-js": "^1.2.0" } }, - "node_modules/@types/fs-extra": { - "version": "9.0.13", -+ "node_modules/@xmldom/xmldom": { -+ "version": "0.8.10", -+ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", -+ "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "dev": true, -- "license": "MIT", -- "dependencies": { +- "dev": true, ++ "node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz", ++ "integrity": "sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==", + "license": "MIT", + "dependencies": { - "@types/node": "*" -+ "engines": { -+ "node": ">=10.0.0" ++ "@vue/compiler-core": "3.4.38", ++ "@vue/shared": "3.4.38" } }, - "node_modules/@types/geojson": { @@ -5353,87 +5130,94 @@ index a38125e..a1067b0 100644 - "node_modules/@types/html-minifier-terser": { - "version": "6.1.0", - "license": "MIT" -+ "node_modules/@xtuc/ieee754": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", -+ "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" - }, +- }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "license": "MIT" -+ "node_modules/@xtuc/long": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", -+ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" - }, +- }, - "node_modules/@types/http-errors": { - "version": "2.0.4", - "dev": true, - "license": "MIT" -+ "node_modules/7zip-bin": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", -+ "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", -+ "dev": true - }, +- }, - "node_modules/@types/http-proxy": { - "version": "1.17.14", -+ "node_modules/accepts": { -+ "version": "1.3.8", -+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", -+ "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.38.tgz", ++ "integrity": "sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==", + "license": "MIT", "dependencies": { - "@types/node": "*" -+ "mime-types": "~2.1.34", -+ "negotiator": "0.6.3" -+ }, -+ "engines": { -+ "node": ">= 0.6" ++ "@vue/compiler-dom": "3.4.38", ++ "@vue/shared": "3.4.38" } }, - "node_modules/@types/json-schema": { - "version": "7.0.15", -- "license": "MIT" -+ "node_modules/ace-builds": { -+ "version": "1.34.2", -+ "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.2.tgz", -+ "integrity": "sha512-wiOZYuxyOSYfZzDasQTe+ZWmRlYxXSJM/kMKZ/bSqO1VgrBl+PaaTz/Sc+y7hXCKAUj3syUdpwxQyvwv9vQe6w==" ++ "node_modules/@vue/server-renderer/node_modules/@vue/shared": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", ++ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==", + "license": "MIT" }, - "node_modules/@types/json5": { - "version": "0.0.29", -+ "node_modules/acorn": { -+ "version": "7.4.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", -+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, -- "license": "MIT" -- }, +- "dev": true, ++ "node_modules/@vue/shared": { ++ "version": "3.2.47", ++ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz", ++ "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==", + "license": "MIT" + }, - "node_modules/@types/keyv": { - "version": "3.1.4", -- "license": "MIT", -- "dependencies": { ++ "node_modules/@vueuse/core": { ++ "version": "10.4.1", ++ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.4.1.tgz", ++ "integrity": "sha512-DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg==", + "license": "MIT", + "dependencies": { - "@types/node": "*" -+ "bin": { -+ "acorn": "bin/acorn" ++ "@types/web-bluetooth": "^0.0.17", ++ "@vueuse/metadata": "10.4.1", ++ "@vueuse/shared": "10.4.1", ++ "vue-demi": ">=0.14.5" + }, -+ "engines": { -+ "node": ">=0.4.0" ++ "funding": { ++ "url": "https://github.com/sponsors/antfu" } }, - "node_modules/@types/leaflet": { - "version": "1.7.11", -+ "node_modules/acorn-jsx": { -+ "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", -+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@vueuse/core/node_modules/vue-demi": { ++ "version": "0.14.10", ++ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", ++ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", ++ "hasInstallScript": true, + "license": "MIT", - "dependencies": { - "@types/geojson": "*" ++ "bin": { ++ "vue-demi-fix": "bin/vue-demi-fix.js", ++ "vue-demi-switch": "bin/vue-demi-switch.js" ++ }, ++ "engines": { ++ "node": ">=12" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/antfu" ++ }, + "peerDependencies": { -+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" ++ "@vue/composition-api": "^1.0.0-rc.1", ++ "vue": "^3.0.0-0 || ^2.6.0" ++ }, ++ "peerDependenciesMeta": { ++ "@vue/composition-api": { ++ "optional": true ++ } } }, - "node_modules/@types/marked": { @@ -5448,114 +5232,124 @@ index a38125e..a1067b0 100644 - }, - "node_modules/@types/minimist": { - "version": "1.2.5", -+ "node_modules/acorn-walk": { -+ "version": "8.3.3", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", -+ "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", - "dev": true, +- "dev": true, - "license": "MIT" -+ "dependencies": { -+ "acorn": "^8.11.0" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } - }, +- }, - "node_modules/@types/ms": { - "version": "0.7.34", -+ "node_modules/acorn-walk/node_modules/acorn": { -+ "version": "8.12.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", -+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "dev": true, +- "dev": true, - "license": "MIT" -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } - }, +- }, - "node_modules/@types/node": { - "version": "17.0.45", - "license": "MIT" -+ "node_modules/add-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", -+ "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", -+ "dev": true ++ "node_modules/@vueuse/metadata": { ++ "version": "10.4.1", ++ "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.4.1.tgz", ++ "integrity": "sha512-2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg==", ++ "license": "MIT", ++ "funding": { ++ "url": "https://github.com/sponsors/antfu" ++ } }, - "node_modules/@types/node-forge": { - "version": "1.3.10", -+ "node_modules/agent-base": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@vueuse/shared": { ++ "version": "10.4.1", ++ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.4.1.tgz", ++ "integrity": "sha512-vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg==", + "license": "MIT", "dependencies": { - "@types/node": "*" -+ "debug": "4" ++ "vue-demi": ">=0.14.5" + }, -+ "engines": { -+ "node": ">= 6.0.0" ++ "funding": { ++ "url": "https://github.com/sponsors/antfu" } }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.4", - "dev": true, - "license": "MIT" -- }, ++ "node_modules/@vueuse/shared/node_modules/vue-demi": { ++ "version": "0.14.10", ++ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", ++ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", ++ "hasInstallScript": true, ++ "license": "MIT", ++ "bin": { ++ "vue-demi-fix": "bin/vue-demi-fix.js", ++ "vue-demi-switch": "bin/vue-demi-switch.js" ++ }, ++ "engines": { ++ "node": ">=12" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/antfu" ++ }, ++ "peerDependencies": { ++ "@vue/composition-api": "^1.0.0-rc.1", ++ "vue": "^3.0.0-0 || ^2.6.0" ++ }, ++ "peerDependenciesMeta": { ++ "@vue/composition-api": { ++ "optional": true ++ } ++ } + }, - "node_modules/@types/pg": { - "version": "8.6.6", - "dev": true, -- "license": "MIT", -+ "node_modules/ajv": { -+ "version": "8.17.1", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", -+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", ++ "node_modules/@webassemblyjs/ast": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", ++ "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "license": "MIT", "dependencies": { - "@types/node": "*", - "pg-protocol": "*", - "pg-types": "^2.2.0" -+ "fast-deep-equal": "^3.1.3", -+ "fast-uri": "^3.0.1", -+ "json-schema-traverse": "^1.0.0", -+ "require-from-string": "^2.0.2" -+ }, -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/epoberezkin" ++ "@webassemblyjs/helper-numbers": "1.11.6", ++ "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, - "node_modules/@types/qs": { - "version": "6.9.10", - "dev": true, -- "license": "MIT" -- }, ++ "node_modules/@webassemblyjs/floating-point-hex-parser": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", ++ "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "license": "MIT" + }, - "node_modules/@types/range-parser": { - "version": "1.2.7", - "dev": true, -- "license": "MIT" -- }, ++ "node_modules/@webassemblyjs/helper-api-error": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", ++ "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "license": "MIT" + }, - "node_modules/@types/responselike": { - "version": "1.0.3", -- "license": "MIT", -+ "node_modules/ajv-formats": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", -+ "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", ++ "node_modules/@webassemblyjs/helper-buffer": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", ++ "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", ++ "license": "MIT" ++ }, ++ "node_modules/@webassemblyjs/helper-numbers": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", ++ "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "license": "MIT", "dependencies": { - "@types/node": "*" -+ "ajv": "^8.0.0" -+ }, -+ "peerDependencies": { -+ "ajv": "^8.0.0" -+ }, -+ "peerDependenciesMeta": { -+ "ajv": { -+ "optional": true -+ } ++ "@webassemblyjs/floating-point-hex-parser": "1.11.6", ++ "@webassemblyjs/helper-api-error": "1.11.6", ++ "@xtuc/long": "4.2.2" } }, - "node_modules/@types/retry": { @@ -5565,130 +5359,115 @@ index a38125e..a1067b0 100644 - }, - "node_modules/@types/semver": { - "version": "7.5.6", -- "license": "MIT" -+ "node_modules/ajv-keywords": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", -+ "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", -+ "dependencies": { -+ "fast-deep-equal": "^3.1.3" -+ }, -+ "peerDependencies": { -+ "ajv": "^8.8.2" -+ } ++ "node_modules/@webassemblyjs/helper-wasm-bytecode": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", ++ "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "license": "MIT" }, - "node_modules/@types/send": { - "version": "0.17.4", -+ "node_modules/all-contributors-cli": { -+ "version": "6.20.5", -+ "resolved": "https://registry.npmjs.org/all-contributors-cli/-/all-contributors-cli-6.20.5.tgz", -+ "integrity": "sha512-vWAR4+SyF9ZpkpbFoldCYbuAb8qkzjkj8uW4yJJN2fN48VRO+E7xGTnt+cLTQt5RNgj00MoYx/LJbWesjeSehQ==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@webassemblyjs/helper-wasm-section": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", ++ "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "license": "MIT", "dependencies": { - "@types/mime": "^1", - "@types/node": "*" -+ "@babel/runtime": "^7.7.6", -+ "async": "^3.1.0", -+ "chalk": "^4.0.0", -+ "didyoumean": "^1.2.1", -+ "inquirer": "^7.3.3", -+ "json-fixer": "^1.6.8", -+ "lodash": "^4.11.2", -+ "node-fetch": "^2.6.0", -+ "pify": "^5.0.0", -+ "yargs": "^15.0.1" -+ }, -+ "bin": { -+ "all-contributors": "dist/cli.js" -+ }, -+ "engines": { -+ "node": ">=4" ++ "@webassemblyjs/ast": "1.12.1", ++ "@webassemblyjs/helper-buffer": "1.12.1", ++ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", ++ "@webassemblyjs/wasm-gen": "1.12.1" } }, - "node_modules/@types/serve-index": { - "version": "1.9.4", -+ "node_modules/all-contributors-cli/node_modules/cliui": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", -+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@webassemblyjs/ieee754": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", ++ "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "license": "MIT", "dependencies": { - "@types/express": "*" -+ "string-width": "^4.2.0", -+ "strip-ansi": "^6.0.0", -+ "wrap-ansi": "^6.2.0" ++ "@xtuc/ieee754": "^1.2.0" } }, - "node_modules/@types/serve-static": { - "version": "1.15.5", -+ "node_modules/all-contributors-cli/node_modules/find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, +- "dev": true, - "license": "MIT", ++ "node_modules/@webassemblyjs/leb128": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", ++ "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", ++ "license": "Apache-2.0", "dependencies": { - "@types/http-errors": "*", - "@types/mime": "*", - "@types/node": "*" -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" ++ "@xtuc/long": "4.2.2" } }, - "node_modules/@types/sockjs": { - "version": "0.3.36", -+ "node_modules/all-contributors-cli/node_modules/locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@webassemblyjs/utf8": { ++ "version": "1.11.6", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", ++ "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", ++ "license": "MIT" ++ }, ++ "node_modules/@webassemblyjs/wasm-edit": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", ++ "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "license": "MIT", "dependencies": { - "@types/node": "*" -+ "p-locate": "^4.1.0" -+ }, -+ "engines": { -+ "node": ">=8" ++ "@webassemblyjs/ast": "1.12.1", ++ "@webassemblyjs/helper-buffer": "1.12.1", ++ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", ++ "@webassemblyjs/helper-wasm-section": "1.12.1", ++ "@webassemblyjs/wasm-gen": "1.12.1", ++ "@webassemblyjs/wasm-opt": "1.12.1", ++ "@webassemblyjs/wasm-parser": "1.12.1", ++ "@webassemblyjs/wast-printer": "1.12.1" } }, - "node_modules/@types/ssh2": { - "version": "1.11.17", -+ "node_modules/all-contributors-cli/node_modules/p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@webassemblyjs/wasm-gen": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", ++ "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "license": "MIT", "dependencies": { - "@types/node": "^18.11.18" -+ "p-try": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" ++ "@webassemblyjs/ast": "1.12.1", ++ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", ++ "@webassemblyjs/ieee754": "1.11.6", ++ "@webassemblyjs/leb128": "1.11.6", ++ "@webassemblyjs/utf8": "1.11.6" } }, - "node_modules/@types/ssh2/node_modules/@types/node": { - "version": "18.18.13", -+ "node_modules/all-contributors-cli/node_modules/p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@webassemblyjs/wasm-opt": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", ++ "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" -+ "p-limit": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=8" ++ "@webassemblyjs/ast": "1.12.1", ++ "@webassemblyjs/helper-buffer": "1.12.1", ++ "@webassemblyjs/wasm-gen": "1.12.1", ++ "@webassemblyjs/wasm-parser": "1.12.1" } }, - "node_modules/@types/web-bluetooth": { @@ -5697,34 +5476,54 @@ index a38125e..a1067b0 100644 - }, - "node_modules/@types/ws": { - "version": "8.5.10", -+ "node_modules/all-contributors-cli/node_modules/path-exists": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, -- "license": "MIT", -- "dependencies": { +- "dev": true, ++ "node_modules/@webassemblyjs/wasm-parser": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", ++ "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "license": "MIT", + "dependencies": { - "@types/node": "*" -- } -- }, ++ "@webassemblyjs/ast": "1.12.1", ++ "@webassemblyjs/helper-api-error": "1.11.6", ++ "@webassemblyjs/helper-wasm-bytecode": "1.11.6", ++ "@webassemblyjs/ieee754": "1.11.6", ++ "@webassemblyjs/leb128": "1.11.6", ++ "@webassemblyjs/utf8": "1.11.6" + } + }, - "node_modules/@types/yauzl": { - "version": "2.10.3", -- "license": "MIT", ++ "node_modules/@webassemblyjs/wast-printer": { ++ "version": "1.12.1", ++ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", ++ "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "license": "MIT", - "optional": true, -- "dependencies": { + "dependencies": { - "@types/node": "*" -+ "engines": { -+ "node": ">=8" ++ "@webassemblyjs/ast": "1.12.1", ++ "@xtuc/long": "4.2.2" } }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.18.0", -+ "node_modules/all-contributors-cli/node_modules/wrap-ansi": { -+ "version": "6.2.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", -+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/@webpack-cli/configtest": { ++ "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", ++ "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", ++ "license": "MIT", ++ "peerDependencies": { ++ "webpack": "4.x.x || 5.x.x", ++ "webpack-cli": "4.x.x" ++ } ++ }, ++ "node_modules/@webpack-cli/info": { ++ "version": "1.5.0", ++ "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", ++ "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/type-utils": "5.18.0", @@ -5735,9 +5534,139 @@ index a38125e..a1067b0 100644 - "regexpp": "^3.2.0", - "semver": "^7.3.5", - "tsutils": "^3.21.0" -+ "ansi-styles": "^4.0.0", -+ "string-width": "^4.1.0", -+ "strip-ansi": "^6.0.0" +- }, +- "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "envinfo": "^7.7.3" + }, + "peerDependencies": { +- "@typescript-eslint/parser": "^5.0.0", +- "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" ++ "webpack-cli": "4.x.x" ++ } ++ }, ++ "node_modules/@webpack-cli/serve": { ++ "version": "1.7.0", ++ "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", ++ "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", ++ "license": "MIT", ++ "peerDependencies": { ++ "webpack-cli": "4.x.x" + }, + "peerDependenciesMeta": { +- "typescript": { ++ "webpack-dev-server": { + "optional": true + } + } + }, +- "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { +- "version": "6.0.0", ++ "node_modules/@xmldom/xmldom": { ++ "version": "0.8.10", ++ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", ++ "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "dev": true, +- "license": "ISC", +- "dependencies": { +- "yallist": "^4.0.0" +- }, ++ "license": "MIT", + "engines": { +- "node": ">=10" ++ "node": ">=10.0.0" + } + }, +- "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { +- "version": "7.5.4", ++ "node_modules/@xtuc/ieee754": { ++ "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", ++ "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", ++ "license": "BSD-3-Clause" ++ }, ++ "node_modules/@xtuc/long": { ++ "version": "4.2.2", ++ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", ++ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", ++ "license": "Apache-2.0" ++ }, ++ "node_modules/7zip-bin": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", ++ "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", + "dev": true, +- "license": "ISC", ++ "license": "MIT" ++ }, ++ "node_modules/accepts": { ++ "version": "1.3.8", ++ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", ++ "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", ++ "dev": true, ++ "license": "MIT", + "dependencies": { +- "lru-cache": "^6.0.0" ++ "mime-types": "~2.1.34", ++ "negotiator": "0.6.3" + }, ++ "engines": { ++ "node": ">= 0.6" ++ } ++ }, ++ "node_modules/ace-builds": { ++ "version": "1.34.2", ++ "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.2.tgz", ++ "integrity": "sha512-wiOZYuxyOSYfZzDasQTe+ZWmRlYxXSJM/kMKZ/bSqO1VgrBl+PaaTz/Sc+y7hXCKAUj3syUdpwxQyvwv9vQe6w==", ++ "license": "BSD-3-Clause" ++ }, ++ "node_modules/acorn": { ++ "version": "7.4.1", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", ++ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", ++ "dev": true, ++ "license": "MIT", + "bin": { +- "semver": "bin/semver.js" ++ "acorn": "bin/acorn" + }, + "engines": { +- "node": ">=10" ++ "node": ">=0.4.0" + } + }, +- "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { +- "version": "4.0.0", ++ "node_modules/acorn-jsx": { ++ "version": "5.3.2", ++ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", ++ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, +- "license": "ISC" ++ "license": "MIT", ++ "peerDependencies": { ++ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" ++ } + }, +- "node_modules/@typescript-eslint/parser": { +- "version": "5.18.0", ++ "node_modules/acorn-walk": { ++ "version": "8.3.4", ++ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", ++ "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, +- "license": "BSD-2-Clause", ++ "license": "MIT", + "dependencies": { +- "@typescript-eslint/scope-manager": "5.18.0", +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/typescript-estree": "5.18.0", +- "debug": "^4.3.2" ++ "acorn": "^8.11.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -5747,32 +5676,329 @@ index a38125e..a1067b0 100644 - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { -- "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } ++ "node": ">=0.4.0" + } + }, +- "node_modules/@typescript-eslint/scope-manager": { +- "version": "5.18.0", ++ "node_modules/acorn-walk/node_modules/acorn": { ++ "version": "8.13.0", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", ++ "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", + "dev": true, + "license": "MIT", +- "dependencies": { +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/visitor-keys": "5.18.0" ++ "bin": { ++ "acorn": "bin/acorn" + }, + "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "node": ">=0.4.0" + } + }, +- "node_modules/@typescript-eslint/type-utils": { +- "version": "5.18.0", ++ "node_modules/add-stream": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", ++ "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/agent-base": { ++ "version": "6.0.2", ++ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", ++ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@typescript-eslint/utils": "5.18.0", +- "debug": "^4.3.2", +- "tsutils": "^3.21.0" ++ "debug": "4" + }, + "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ "node": ">= 6.0.0" ++ } ++ }, ++ "node_modules/ajv": { ++ "version": "8.17.1", ++ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", ++ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", ++ "license": "MIT", ++ "dependencies": { ++ "fast-deep-equal": "^3.1.3", ++ "fast-uri": "^3.0.1", ++ "json-schema-traverse": "^1.0.0", ++ "require-from-string": "^2.0.2" + }, + "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "type": "github", ++ "url": "https://github.com/sponsors/epoberezkin" ++ } ++ }, ++ "node_modules/ajv-formats": { ++ "version": "2.1.1", ++ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", ++ "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", ++ "license": "MIT", ++ "dependencies": { ++ "ajv": "^8.0.0" + }, + "peerDependencies": { +- "eslint": "*" ++ "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { +- "typescript": { ++ "ajv": { + "optional": true + } + } + }, +- "node_modules/@typescript-eslint/types": { +- "version": "5.18.0", +- "dev": true, ++ "node_modules/ajv-keywords": { ++ "version": "5.1.0", ++ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", ++ "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "license": "MIT", +- "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ "dependencies": { ++ "fast-deep-equal": "^3.1.3" + }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "peerDependencies": { ++ "ajv": "^8.8.2" + } + }, +- "node_modules/@typescript-eslint/typescript-estree": { +- "version": "5.18.0", ++ "node_modules/all-contributors-cli": { ++ "version": "6.20.5", ++ "resolved": "https://registry.npmjs.org/all-contributors-cli/-/all-contributors-cli-6.20.5.tgz", ++ "integrity": "sha512-vWAR4+SyF9ZpkpbFoldCYbuAb8qkzjkj8uW4yJJN2fN48VRO+E7xGTnt+cLTQt5RNgj00MoYx/LJbWesjeSehQ==", + "dev": true, +- "license": "BSD-2-Clause", ++ "license": "MIT", + "dependencies": { +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/visitor-keys": "5.18.0", +- "debug": "^4.3.2", +- "globby": "^11.0.4", +- "is-glob": "^4.0.3", +- "semver": "^7.3.5", +- "tsutils": "^3.21.0" +- }, +- "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ "@babel/runtime": "^7.7.6", ++ "async": "^3.1.0", ++ "chalk": "^4.0.0", ++ "didyoumean": "^1.2.1", ++ "inquirer": "^7.3.3", ++ "json-fixer": "^1.6.8", ++ "lodash": "^4.11.2", ++ "node-fetch": "^2.6.0", ++ "pify": "^5.0.0", ++ "yargs": "^15.0.1" + }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "bin": { ++ "all-contributors": "dist/cli.js" + }, +- "peerDependenciesMeta": { +- "typescript": { +- "optional": true +- } ++ "engines": { ++ "node": ">=4" + } + }, +- "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { ++ "node_modules/all-contributors-cli/node_modules/cliui": { + "version": "6.0.0", ++ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", ++ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "license": "ISC", + "dependencies": { +- "yallist": "^4.0.0" +- }, +- "engines": { +- "node": ">=10" ++ "string-width": "^4.2.0", ++ "strip-ansi": "^6.0.0", ++ "wrap-ansi": "^6.2.0" + } + }, +- "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { +- "version": "7.5.4", ++ "node_modules/all-contributors-cli/node_modules/find-up": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", ++ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, +- "license": "ISC", ++ "license": "MIT", + "dependencies": { +- "lru-cache": "^6.0.0" +- }, +- "bin": { +- "semver": "bin/semver.js" ++ "locate-path": "^5.0.0", ++ "path-exists": "^4.0.0" + }, + "engines": { +- "node": ">=10" + "node": ">=8" } }, -- "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { -- "version": "6.0.0", +- "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { +- "version": "4.0.0", ++ "node_modules/all-contributors-cli/node_modules/locate-path": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", ++ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, +- "license": "ISC" ++ "license": "MIT", ++ "dependencies": { ++ "p-locate": "^4.1.0" ++ }, ++ "engines": { ++ "node": ">=8" ++ } + }, +- "node_modules/@typescript-eslint/utils": { +- "version": "5.18.0", ++ "node_modules/all-contributors-cli/node_modules/p-limit": { ++ "version": "2.3.0", ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", ++ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@types/json-schema": "^7.0.9", +- "@typescript-eslint/scope-manager": "5.18.0", +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/typescript-estree": "5.18.0", +- "eslint-scope": "^5.1.1", +- "eslint-utils": "^3.0.0" ++ "p-try": "^2.0.0" + }, + "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ "node": ">=6" + }, + "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" +- }, +- "peerDependencies": { +- "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/@typescript-eslint/visitor-keys": { +- "version": "5.18.0", ++ "node_modules/all-contributors-cli/node_modules/p-locate": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", ++ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@typescript-eslint/types": "5.18.0", +- "eslint-visitor-keys": "^3.0.0" ++ "p-limit": "^2.2.0" + }, + "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "node": ">=8" + } + }, +- "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { +- "version": "3.4.3", ++ "node_modules/all-contributors-cli/node_modules/path-exists": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", ++ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, +- "license": "Apache-2.0", ++ "license": "MIT", + "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" +- }, +- "funding": { +- "url": "https://opencollective.com/eslint" ++ "node": ">=8" + } + }, +- "node_modules/@vue/compiler-core": { +- "version": "3.2.47", ++ "node_modules/all-contributors-cli/node_modules/wrap-ansi": { ++ "version": "6.2.0", ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", ++ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "@babel/parser": "^7.16.4", +- "@vue/shared": "3.2.47", +- "estree-walker": "^2.0.2", +- "source-map": "^0.6.1" ++ "ansi-styles": "^4.0.0", ++ "string-width": "^4.1.0", ++ "strip-ansi": "^6.0.0" ++ }, ++ "engines": { ++ "node": ">=8" + } + }, +- "node_modules/@vue/compiler-dom": { +- "version": "3.2.47", + "node_modules/all-contributors-cli/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", -+ "dev": true ++ "dev": true, ++ "license": "ISC" + }, + "node_modules/all-contributors-cli/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, -- "license": "ISC", ++ "dev": true, + "license": "MIT", "dependencies": { -- "yallist": "^4.0.0" +- "@vue/compiler-core": "3.2.47", +- "@vue/shared": "3.2.47" + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", @@ -5784,194 +6010,254 @@ index a38125e..a1067b0 100644 + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" - }, - "engines": { -- "node": ">=10" ++ }, ++ "engines": { + "node": ">=8" } }, -- "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { -- "version": "7.5.4", +- "node_modules/@vue/compiler-sfc": { +- "version": "3.2.47", +- "license": "MIT", + "node_modules/all-contributors-cli/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, -- "license": "ISC", ++ "dev": true, ++ "license": "ISC", "dependencies": { -- "lru-cache": "^6.0.0" -- }, -- "bin": { -- "semver": "bin/semver.js" +- "@babel/parser": "^7.16.4", +- "@vue/compiler-core": "3.2.47", +- "@vue/compiler-dom": "3.2.47", +- "@vue/compiler-ssr": "3.2.47", +- "@vue/reactivity-transform": "3.2.47", +- "@vue/shared": "3.2.47", +- "estree-walker": "^2.0.2", +- "magic-string": "^0.25.7", +- "postcss": "^8.1.10", +- "source-map": "^0.6.1" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" - }, - "engines": { -- "node": ">=10" ++ }, ++ "engines": { + "node": ">=6" } }, -- "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { -- "version": "4.0.0", +- "node_modules/@vue/compiler-ssr": { +- "version": "3.2.47", + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true, -- "license": "ISC" ++ "dev": true, + "license": "MIT", +- "dependencies": { +- "@vue/compiler-dom": "3.2.47", +- "@vue/shared": "3.2.47" + "engines": { + "node": ">=6" -+ } + } }, -- "node_modules/@typescript-eslint/parser": { -- "version": "5.18.0", +- "node_modules/@vue/devtools-api": { +- "version": "6.5.1", +- "license": "MIT" +- }, +- "node_modules/@vue/reactivity": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz", +- "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==", +- "dependencies": { +- "@vue/shared": "3.4.27" +- } +- }, +- "node_modules/@vue/reactivity-transform": { +- "version": "3.2.47", + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, -- "license": "BSD-2-Clause", ++ "dev": true, + "license": "MIT", "dependencies": { -- "@typescript-eslint/scope-manager": "5.18.0", -- "@typescript-eslint/types": "5.18.0", -- "@typescript-eslint/typescript-estree": "5.18.0", -- "debug": "^4.3.2" +- "@babel/parser": "^7.16.4", +- "@vue/compiler-core": "3.2.47", +- "@vue/shared": "3.2.47", +- "estree-walker": "^2.0.2", +- "magic-string": "^0.25.7" +- } +- }, +- "node_modules/@vue/reactivity/node_modules/@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- }, +- "node_modules/@vue/runtime-core": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz", +- "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==", +- "dependencies": { +- "@vue/reactivity": "3.4.27", +- "@vue/shared": "3.4.27" + "type-fest": "^0.21.3" - }, - "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ }, ++ "engines": { + "node": ">=8" - }, - "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" -- }, -- "peerDependencies": { -- "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" -- }, -- "peerDependenciesMeta": { -- "typescript": { -- "optional": true -- } ++ }, ++ "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/@typescript-eslint/scope-manager": { -- "version": "5.18.0", +- "node_modules/@vue/runtime-core/node_modules/@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- }, +- "node_modules/@vue/runtime-dom": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz", +- "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==", +- "dependencies": { +- "@vue/runtime-core": "3.4.27", +- "@vue/shared": "3.4.27", +- "csstype": "^3.1.3" + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, -- "license": "MIT", -- "dependencies": { -- "@typescript-eslint/types": "5.18.0", -- "@typescript-eslint/visitor-keys": "5.18.0" -- }, - "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ "dev": true, ++ "license": "(MIT OR CC0-1.0)", ++ "engines": { + "node": ">=10" - }, - "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" ++ }, ++ "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/@typescript-eslint/type-utils": { -- "version": "5.18.0", +- "node_modules/@vue/runtime-dom/node_modules/@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- }, +- "node_modules/@vue/server-renderer": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz", +- "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==", +- "dependencies": { +- "@vue/compiler-ssr": "3.4.27", +- "@vue/shared": "3.4.27" +- }, +- "peerDependencies": { +- "vue": "3.4.27" + "node_modules/ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", - "dev": true, -- "license": "MIT", ++ "dev": true, + "engines": [ + "node >= 0.8.0" + ], ++ "license": "Apache-2.0", + "bin": { + "ansi-html": "bin/ansi-html" -+ } -+ }, + } + }, +- "node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz", +- "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==", +- "dependencies": { +- "@babel/parser": "^7.24.4", +- "@vue/shared": "3.4.27", +- "entities": "^4.5.0", +- "estree-walker": "^2.0.2", +- "source-map-js": "^1.2.0" + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", ++ "license": "MIT", + "engines": { + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz", +- "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==", + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", ++ "license": "MIT", "dependencies": { -- "@typescript-eslint/utils": "5.18.0", -- "debug": "^4.3.2", -- "tsutils": "^3.21.0" +- "@vue/compiler-core": "3.4.27", +- "@vue/shared": "3.4.27" + "color-convert": "^2.0.1" - }, - "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" ++ }, ++ "engines": { + "node": ">=8" - }, - "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" -- }, -- "peerDependencies": { -- "eslint": "*" -- }, -- "peerDependenciesMeta": { -- "typescript": { -- "optional": true -- } ++ }, ++ "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, -- "node_modules/@typescript-eslint/types": { -- "version": "5.18.0", -- "dev": true, -- "license": "MIT", -- "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" +- "node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz", +- "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==", + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", -+ "dependencies": { ++ "license": "ISC", + "dependencies": { +- "@vue/compiler-dom": "3.4.27", +- "@vue/shared": "3.4.27" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" - }, -- "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" ++ }, + "engines": { + "node": ">= 8" } }, -- "node_modules/@typescript-eslint/typescript-estree": { -- "version": "5.18.0", +- "node_modules/@vue/server-renderer/node_modules/@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- }, +- "node_modules/@vue/shared": { +- "version": "3.2.47", + "node_modules/app-builder-bin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz", + "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==", -+ "dev": true -+ }, ++ "dev": true, + "license": "MIT" + }, +- "node_modules/@vueuse/core": { +- "version": "10.4.1", + "node_modules/app-builder-lib": { + "version": "24.13.3", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.13.3.tgz", + "integrity": "sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==", - "dev": true, -- "license": "BSD-2-Clause", ++ "dev": true, + "license": "MIT", "dependencies": { -- "@typescript-eslint/types": "5.18.0", -- "@typescript-eslint/visitor-keys": "5.18.0", -- "debug": "^4.3.2", -- "globby": "^11.0.4", -- "is-glob": "^4.0.3", -- "semver": "^7.3.5", -- "tsutils": "^3.21.0" +- "@types/web-bluetooth": "^0.0.17", +- "@vueuse/metadata": "10.4.1", +- "@vueuse/shared": "10.4.1", +- "vue-demi": ">=0.14.5" +- }, +- "funding": { +- "url": "https://github.com/sponsors/antfu" +- } +- }, +- "node_modules/@vueuse/core/node_modules/vue-demi": { +- "version": "0.14.6", +- "hasInstallScript": true, +- "license": "MIT", +- "bin": { +- "vue-demi-fix": "bin/vue-demi-fix.js", +- "vue-demi-switch": "bin/vue-demi-switch.js" + "@develar/schema-utils": "~2.6.5", + "@electron/notarize": "2.2.1", + "@electron/osx-sign": "1.0.5", @@ -6001,97 +6287,133 @@ index a38125e..a1067b0 100644 + "temp-file": "^3.4.0" }, "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" +- "node": ">=12" - }, - "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" +- "url": "https://github.com/sponsors/antfu" + "node": ">=14.0.0" }, + "peerDependencies": { +- "@vue/composition-api": "^1.0.0-rc.1", +- "vue": "^3.0.0-0 || ^2.6.0" +- }, - "peerDependenciesMeta": { -- "typescript": { +- "@vue/composition-api": { - "optional": true - } -+ "peerDependencies": { + "dmg-builder": "24.13.3", + "electron-builder-squirrel-windows": "24.13.3" } }, -- "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { -- "version": "6.0.0", +- "node_modules/@vueuse/metadata": { +- "version": "10.4.1", + "node_modules/app-builder-lib/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "yallist": "^4.0.0" ++ "dev": true, + "license": "MIT", +- "funding": { +- "url": "https://github.com/sponsors/antfu" ++ "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" - }, - "engines": { -- "node": ">=10" ++ }, ++ "engines": { + "node": ">=12" } }, -- "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { -- "version": "7.5.4", +- "node_modules/@vueuse/shared": { +- "version": "10.4.1", + "node_modules/app-builder-lib/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, -- "license": "ISC", ++ "dev": true, + "license": "MIT", "dependencies": { -- "lru-cache": "^6.0.0" +- "vue-demi": ">=0.14.5" + "universalify": "^2.0.0" }, +- "funding": { +- "url": "https://github.com/sponsors/antfu" + "optionalDependencies": { + "graceful-fs": "^4.1.6" -+ } -+ }, + } + }, +- "node_modules/@vueuse/shared/node_modules/vue-demi": { +- "version": "0.14.6", +- "hasInstallScript": true, +- "license": "MIT", + "node_modules/app-builder-lib/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, ++ "license": "ISC", "bin": { - "semver": "bin/semver.js" +- "vue-demi-fix": "bin/vue-demi-fix.js", +- "vue-demi-switch": "bin/vue-demi-switch.js" ++ "semver": "bin/semver.js" }, -@@ -4047,718 +4643,688 @@ - "node": ">=10" + "engines": { +- "node": ">=12" +- }, +- "funding": { +- "url": "https://github.com/sponsors/antfu" +- }, +- "peerDependencies": { +- "@vue/composition-api": "^1.0.0-rc.1", +- "vue": "^3.0.0-0 || ^2.6.0" +- }, +- "peerDependenciesMeta": { +- "@vue/composition-api": { +- "optional": true +- } ++ "node": ">=10" } }, -- "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { -- "version": "4.0.0", +- "node_modules/@webassemblyjs/ast": { +- "version": "1.12.1", + "node_modules/app-builder-lib/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, -- "license": "ISC" ++ "dev": true, + "license": "MIT", +- "dependencies": { +- "@webassemblyjs/helper-numbers": "1.11.6", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "engines": { + "node": ">= 10.0.0" -+ } + } }, -- "node_modules/@typescript-eslint/utils": { -- "version": "5.18.0", +- "node_modules/@webassemblyjs/floating-point-hex-parser": { +- "version": "1.11.6", +- "license": "MIT" +- }, +- "node_modules/@webassemblyjs/helper-api-error": { +- "version": "1.11.6", +- "license": "MIT" +- }, +- "node_modules/@webassemblyjs/helper-buffer": { +- "version": "1.12.1", +- "license": "MIT" +- }, +- "node_modules/@webassemblyjs/helper-numbers": { +- "version": "1.11.6", + "node_modules/archiver": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", - "dev": true, -- "license": "MIT", ++ "dev": true, + "license": "MIT", + "peer": true, "dependencies": { -- "@types/json-schema": "^7.0.9", -- "@typescript-eslint/scope-manager": "5.18.0", -- "@typescript-eslint/types": "5.18.0", -- "@typescript-eslint/typescript-estree": "5.18.0", -- "eslint-scope": "^5.1.1", -- "eslint-utils": "^3.0.0" +- "@webassemblyjs/floating-point-hex-parser": "1.11.6", +- "@webassemblyjs/helper-api-error": "1.11.6", +- "@xtuc/long": "4.2.2" + "archiver-utils": "^2.1.0", + "async": "^3.2.4", + "buffer-crc32": "^0.2.1", @@ -6099,31 +6421,29 @@ index a38125e..a1067b0 100644 + "readdir-glob": "^1.1.2", + "tar-stream": "^2.2.0", + "zip-stream": "^4.1.0" - }, - "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -- }, -- "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" -- }, -- "peerDependencies": { -- "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" ++ }, ++ "engines": { + "node": ">= 10" } }, -- "node_modules/@typescript-eslint/visitor-keys": { -- "version": "5.18.0", +- "node_modules/@webassemblyjs/helper-wasm-bytecode": { +- "version": "1.11.6", +- "license": "MIT" +- }, +- "node_modules/@webassemblyjs/helper-wasm-section": { +- "version": "1.12.1", + "node_modules/archiver-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "dev": true, -- "license": "MIT", ++ "dev": true, + "license": "MIT", + "peer": true, "dependencies": { -- "@typescript-eslint/types": "5.18.0", -- "eslint-visitor-keys": "^3.0.0" +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-buffer": "1.12.1", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", +- "@webassemblyjs/wasm-gen": "1.12.1" + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", @@ -6134,101 +6454,30 @@ index a38125e..a1067b0 100644 + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" - }, - "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -- }, -- "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/typescript-eslint" ++ }, ++ "engines": { + "node": ">= 6" } }, -- "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { -- "version": "3.4.3", +- "node_modules/@webassemblyjs/ieee754": { +- "version": "1.11.6", + "node_modules/archiver-utils/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, -- "license": "Apache-2.0", -- "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -- }, -- "funding": { -- "url": "https://opencollective.com/eslint" -- } -- }, -- "node_modules/@vue/compiler-core": { -- "version": "3.2.47", -- "license": "MIT", -- "dependencies": { -- "@babel/parser": "^7.16.4", -- "@vue/shared": "3.2.47", -- "estree-walker": "^2.0.2", -- "source-map": "^0.6.1" -- } -- }, -- "node_modules/@vue/compiler-dom": { -- "version": "3.2.47", -- "license": "MIT", -- "dependencies": { -- "@vue/compiler-core": "3.2.47", -- "@vue/shared": "3.2.47" -- } -- }, -- "node_modules/@vue/compiler-sfc": { -- "version": "3.2.47", -- "license": "MIT", -- "dependencies": { -- "@babel/parser": "^7.16.4", -- "@vue/compiler-core": "3.2.47", -- "@vue/compiler-dom": "3.2.47", -- "@vue/compiler-ssr": "3.2.47", -- "@vue/reactivity-transform": "3.2.47", -- "@vue/shared": "3.2.47", -- "estree-walker": "^2.0.2", -- "magic-string": "^0.25.7", -- "postcss": "^8.1.10", -- "source-map": "^0.6.1" -- } -- }, -- "node_modules/@vue/compiler-ssr": { -- "version": "3.2.47", -- "license": "MIT", -- "dependencies": { -- "@vue/compiler-dom": "3.2.47", -- "@vue/shared": "3.2.47" -- } -- }, -- "node_modules/@vue/devtools-api": { -- "version": "6.5.1", -- "license": "MIT" -- }, -- "node_modules/@vue/reactivity": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz", -- "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==", -- "dependencies": { -- "@vue/shared": "3.4.27" -- } ++ "dev": true, ++ "license": "MIT", + "peer": true - }, -- "node_modules/@vue/reactivity-transform": { -- "version": "3.2.47", -- "license": "MIT", ++ }, + "node_modules/archiver-utils/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "license": "MIT", + "peer": true, "dependencies": { -- "@babel/parser": "^7.16.4", -- "@vue/compiler-core": "3.2.47", -- "@vue/shared": "3.2.47", -- "estree-walker": "^2.0.2", -- "magic-string": "^0.25.7" +- "@xtuc/ieee754": "^1.2.0" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", @@ -6238,422 +6487,52 @@ index a38125e..a1067b0 100644 + "util-deprecate": "~1.0.1" } }, -- "node_modules/@vue/reactivity/node_modules/@vue/shared": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", -- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- "node_modules/@webassemblyjs/leb128": { +- "version": "1.11.6", +- "license": "Apache-2.0", + "node_modules/archiver-utils/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, ++ "license": "MIT", + "peer": true - }, -- "node_modules/@vue/runtime-core": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz", -- "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==", ++ }, + "node_modules/archiver-utils/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, ++ "license": "MIT", + "peer": true, "dependencies": { -- "@vue/reactivity": "3.4.27", -- "@vue/shared": "3.4.27" +- "@xtuc/long": "4.2.2" + "safe-buffer": "~5.1.0" } }, -- "node_modules/@vue/runtime-core/node_modules/@vue/shared": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", -- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" -- }, -- "node_modules/@vue/runtime-dom": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz", -- "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==", -- "dependencies": { -- "@vue/runtime-core": "3.4.27", -- "@vue/shared": "3.4.27", -- "csstype": "^3.1.3" -- } +- "node_modules/@webassemblyjs/utf8": { +- "version": "1.11.6", + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", -+ "dev": true ++ "dev": true, + "license": "MIT" }, -- "node_modules/@vue/runtime-dom/node_modules/@vue/shared": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", -- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- "node_modules/@webassemblyjs/wasm-edit": { +- "version": "1.12.1", + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, -- "node_modules/@vue/server-renderer": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz", -- "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==", ++ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", ++ "license": "Python-2.0" ++ }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, - "dependencies": { -- "@vue/compiler-ssr": "3.4.27", -- "@vue/shared": "3.4.27" -+ "call-bind": "^1.0.5", -+ "is-array-buffer": "^3.0.4" - }, -- "peerDependencies": { -- "vue": "3.4.27" -- } -- }, -- "node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz", -- "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==", -- "dependencies": { -- "@babel/parser": "^7.24.4", -- "@vue/shared": "3.4.27", -- "entities": "^4.5.0", -- "estree-walker": "^2.0.2", -- "source-map-js": "^1.2.0" -- } -- }, -- "node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz", -- "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==", -- "dependencies": { -- "@vue/compiler-core": "3.4.27", -- "@vue/shared": "3.4.27" -- } -- }, -- "node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz", -- "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==", -- "dependencies": { -- "@vue/compiler-dom": "3.4.27", -- "@vue/shared": "3.4.27" -- } -- }, -- "node_modules/@vue/server-renderer/node_modules/@vue/shared": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", -- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" -- }, -- "node_modules/@vue/shared": { -- "version": "3.2.47", -- "license": "MIT" -- }, -- "node_modules/@vueuse/core": { -- "version": "10.4.1", -- "license": "MIT", -- "dependencies": { -- "@types/web-bluetooth": "^0.0.17", -- "@vueuse/metadata": "10.4.1", -- "@vueuse/shared": "10.4.1", -- "vue-demi": ">=0.14.5" -+ "engines": { -+ "node": ">= 0.4" - }, - "funding": { -- "url": "https://github.com/sponsors/antfu" -+ "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/@vueuse/core/node_modules/vue-demi": { -- "version": "0.14.6", -- "hasInstallScript": true, -- "license": "MIT", -- "bin": { -- "vue-demi-fix": "bin/vue-demi-fix.js", -- "vue-demi-switch": "bin/vue-demi-switch.js" -+ "node_modules/array-flatten": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", -+ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", -+ "dev": true -+ }, -+ "node_modules/array-ify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", -+ "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", -+ "dev": true -+ }, -+ "node_modules/array-includes": { -+ "version": "3.1.8", -+ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", -+ "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", -+ "dev": true, -+ "dependencies": { -+ "call-bind": "^1.0.7", -+ "define-properties": "^1.2.1", -+ "es-abstract": "^1.23.2", -+ "es-object-atoms": "^1.0.0", -+ "get-intrinsic": "^1.2.4", -+ "is-string": "^1.0.7" - }, - "engines": { -- "node": ">=12" -+ "node": ">= 0.4" - }, - "funding": { -- "url": "https://github.com/sponsors/antfu" -- }, -- "peerDependencies": { -- "@vue/composition-api": "^1.0.0-rc.1", -- "vue": "^3.0.0-0 || ^2.6.0" -- }, -- "peerDependenciesMeta": { -- "@vue/composition-api": { -- "optional": true -- } -+ "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/@vueuse/metadata": { -- "version": "10.4.1", -- "license": "MIT", -- "funding": { -- "url": "https://github.com/sponsors/antfu" -+ "node_modules/array-union": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", -+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", -+ "dev": true, -+ "engines": { -+ "node": ">=8" - } - }, -- "node_modules/@vueuse/shared": { -- "version": "10.4.1", -- "license": "MIT", -+ "node_modules/array.prototype.flat": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", -+ "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", -+ "dev": true, - "dependencies": { -- "vue-demi": ">=0.14.5" -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.2.0", -+ "es-abstract": "^1.22.1", -+ "es-shim-unscopables": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" - }, - "funding": { -- "url": "https://github.com/sponsors/antfu" -+ "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/@vueuse/shared/node_modules/vue-demi": { -- "version": "0.14.6", -- "hasInstallScript": true, -- "license": "MIT", -- "bin": { -- "vue-demi-fix": "bin/vue-demi-fix.js", -- "vue-demi-switch": "bin/vue-demi-switch.js" -+ "node_modules/arraybuffer.prototype.slice": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", -+ "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", -+ "dev": true, -+ "dependencies": { -+ "array-buffer-byte-length": "^1.0.1", -+ "call-bind": "^1.0.5", -+ "define-properties": "^1.2.1", -+ "es-abstract": "^1.22.3", -+ "es-errors": "^1.2.1", -+ "get-intrinsic": "^1.2.3", -+ "is-array-buffer": "^3.0.4", -+ "is-shared-array-buffer": "^1.0.2" - }, - "engines": { -- "node": ">=12" -+ "node": ">= 0.4" - }, - "funding": { -- "url": "https://github.com/sponsors/antfu" -- }, -- "peerDependencies": { -- "@vue/composition-api": "^1.0.0-rc.1", -- "vue": "^3.0.0-0 || ^2.6.0" -- }, -- "peerDependenciesMeta": { -- "@vue/composition-api": { -- "optional": true -- } -+ "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/@webassemblyjs/ast": { -- "version": "1.12.1", -- "license": "MIT", -+ "node_modules/arrify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", -+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", -+ "dev": true, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/asn1": { -+ "version": "0.2.6", -+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", -+ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dependencies": { -- "@webassemblyjs/helper-numbers": "1.11.6", -- "@webassemblyjs/helper-wasm-bytecode": "1.11.6" -+ "safer-buffer": "~2.1.0" - } - }, -- "node_modules/@webassemblyjs/floating-point-hex-parser": { -- "version": "1.11.6", -- "license": "MIT" -+ "node_modules/assert-plus": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", -+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", -+ "dev": true, -+ "optional": true, -+ "engines": { -+ "node": ">=0.8" -+ } - }, -- "node_modules/@webassemblyjs/helper-api-error": { -- "version": "1.11.6", -- "license": "MIT" -+ "node_modules/astral-regex": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", -+ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", -+ "dev": true, -+ "engines": { -+ "node": ">=8" -+ } - }, -- "node_modules/@webassemblyjs/helper-buffer": { -- "version": "1.12.1", -- "license": "MIT" -+ "node_modules/async": { -+ "version": "3.2.6", -+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", -+ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", -+ "dev": true - }, -- "node_modules/@webassemblyjs/helper-numbers": { -- "version": "1.11.6", -- "license": "MIT", -- "dependencies": { -- "@webassemblyjs/floating-point-hex-parser": "1.11.6", -- "@webassemblyjs/helper-api-error": "1.11.6", -- "@xtuc/long": "4.2.2" -+ "node_modules/async-exit-hook": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", -+ "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", -+ "dev": true, -+ "engines": { -+ "node": ">=0.12.0" - } - }, -- "node_modules/@webassemblyjs/helper-wasm-bytecode": { -- "version": "1.11.6", -- "license": "MIT" -+ "node_modules/asynckit": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", -+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", -+ "dev": true - }, -- "node_modules/@webassemblyjs/helper-wasm-section": { -- "version": "1.12.1", -- "license": "MIT", -- "dependencies": { -- "@webassemblyjs/ast": "1.12.1", -- "@webassemblyjs/helper-buffer": "1.12.1", -- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", -- "@webassemblyjs/wasm-gen": "1.12.1" -+ "node_modules/at-least-node": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", -+ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", -+ "dev": true, -+ "engines": { -+ "node": ">= 4.0.0" - } - }, -- "node_modules/@webassemblyjs/ieee754": { -- "version": "1.11.6", -- "license": "MIT", -- "dependencies": { -- "@xtuc/ieee754": "^1.2.0" -+ "node_modules/atomically": { -+ "version": "1.7.0", -+ "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz", -+ "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==", -+ "engines": { -+ "node": ">=10.12.0" - } - }, -- "node_modules/@webassemblyjs/leb128": { -- "version": "1.11.6", -- "license": "Apache-2.0", -+ "node_modules/available-typed-arrays": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", -+ "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", -+ "dev": true, - "dependencies": { -- "@xtuc/long": "4.2.2" -+ "possible-typed-array-names": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/@webassemblyjs/utf8": { -- "version": "1.11.6", -- "license": "MIT" -+ "node_modules/babel-loader": { -+ "version": "8.2.5", -+ "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", -+ "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", -+ "dependencies": { -+ "find-cache-dir": "^3.3.1", -+ "loader-utils": "^2.0.0", -+ "make-dir": "^3.1.0", -+ "schema-utils": "^2.6.5" -+ }, -+ "engines": { -+ "node": ">= 8.9" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0", -+ "webpack": ">=2" -+ } - }, -- "node_modules/@webassemblyjs/wasm-edit": { -- "version": "1.12.1", -- "license": "MIT", -+ "node_modules/babel-plugin-polyfill-corejs2": { -+ "version": "0.2.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz", -+ "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==", -+ "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", @@ -6663,61 +6542,403 @@ index a38125e..a1067b0 100644 - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" -+ "@babel/compat-data": "^7.13.11", -+ "@babel/helper-define-polyfill-provider": "^0.2.4", -+ "semver": "^6.1.1" ++ "call-bind": "^1.0.5", ++ "is-array-buffer": "^3.0.4" + }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", -- "license": "MIT", -+ "node_modules/babel-plugin-polyfill-corejs3": { -+ "version": "0.2.5", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz", -+ "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==", ++ "node_modules/array-flatten": { ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", ++ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/array-ify": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", ++ "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/array-includes": { ++ "version": "3.1.8", ++ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", ++ "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", ++ "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" -+ "@babel/helper-define-polyfill-provider": "^0.2.2", -+ "core-js-compat": "^3.16.2" ++ "call-bind": "^1.0.7", ++ "define-properties": "^1.2.1", ++ "es-abstract": "^1.23.2", ++ "es-object-atoms": "^1.0.0", ++ "get-intrinsic": "^1.2.4", ++ "is-string": "^1.0.7" + }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", ++ "node_modules/array-union": { ++ "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", ++ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", ++ "dev": true, + "license": "MIT", +- "dependencies": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-buffer": "1.12.1", +- "@webassemblyjs/wasm-gen": "1.12.1", +- "@webassemblyjs/wasm-parser": "1.12.1" ++ "engines": { ++ "node": ">=8" + } + }, +- "node_modules/@webassemblyjs/wasm-parser": { +- "version": "1.12.1", ++ "node_modules/array.prototype.flat": { ++ "version": "1.3.2", ++ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", ++ "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-api-error": "1.11.6", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", +- "@webassemblyjs/ieee754": "1.11.6", +- "@webassemblyjs/leb128": "1.11.6", +- "@webassemblyjs/utf8": "1.11.6" ++ "call-bind": "^1.0.2", ++ "define-properties": "^1.2.0", ++ "es-abstract": "^1.22.1", ++ "es-shim-unscopables": "^1.0.0" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" + } + }, +- "node_modules/@webassemblyjs/wast-printer": { +- "version": "1.12.1", ++ "node_modules/arraybuffer.prototype.slice": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", ++ "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "@webassemblyjs/ast": "1.12.1", +- "@xtuc/long": "4.2.2" ++ "array-buffer-byte-length": "^1.0.1", ++ "call-bind": "^1.0.5", ++ "define-properties": "^1.2.1", ++ "es-abstract": "^1.22.3", ++ "es-errors": "^1.2.1", ++ "get-intrinsic": "^1.2.3", ++ "is-array-buffer": "^3.0.4", ++ "is-shared-array-buffer": "^1.0.2" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" + } + }, +- "node_modules/@webpack-cli/configtest": { +- "version": "1.2.0", ++ "node_modules/arrify": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", ++ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", ++ "dev": true, + "license": "MIT", +- "peerDependencies": { +- "webpack": "4.x.x || 5.x.x", +- "webpack-cli": "4.x.x" ++ "engines": { ++ "node": ">=0.10.0" + } + }, +- "node_modules/@webpack-cli/info": { +- "version": "1.5.0", ++ "node_modules/asn1": { ++ "version": "0.2.6", ++ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", ++ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "license": "MIT", + "dependencies": { +- "envinfo": "^7.7.3" +- }, +- "peerDependencies": { +- "webpack-cli": "4.x.x" ++ "safer-buffer": "~2.1.0" + } + }, +- "node_modules/@webpack-cli/serve": { +- "version": "1.7.0", ++ "node_modules/assert-plus": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", ++ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", ++ "dev": true, + "license": "MIT", +- "peerDependencies": { +- "webpack-cli": "4.x.x" +- }, +- "peerDependenciesMeta": { +- "webpack-dev-server": { +- "optional": true +- } ++ "optional": true, ++ "engines": { ++ "node": ">=0.8" + } + }, +- "node_modules/@xmldom/xmldom": { +- "version": "0.8.10", ++ "node_modules/astral-regex": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", ++ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "license": "MIT", + "engines": { +- "node": ">=10.0.0" ++ "node": ">=8" + } + }, +- "node_modules/@xtuc/ieee754": { +- "version": "1.2.0", +- "license": "BSD-3-Clause" +- }, +- "node_modules/@xtuc/long": { +- "version": "4.2.2", +- "license": "Apache-2.0" +- }, +- "node_modules/7zip-bin": { +- "version": "5.2.0", ++ "node_modules/async": { ++ "version": "3.2.6", ++ "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", ++ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "dev": true, + "license": "MIT" + }, +- "node_modules/accepts": { +- "version": "1.3.8", ++ "node_modules/async-exit-hook": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", ++ "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", + "dev": true, + "license": "MIT", +- "dependencies": { +- "mime-types": "~2.1.34", +- "negotiator": "0.6.3" +- }, + "engines": { +- "node": ">= 0.6" ++ "node": ">=0.12.0" + } + }, +- "node_modules/ace-builds": { +- "version": "1.34.1", +- "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.1.tgz", +- "integrity": "sha512-hwRzr6BkRwsq5A19yA9E36KNNtn0+zESYolnWK3TADJsWVQS0T24nvbgdjXwqk2JEMQXE4PlqAw+ZgprvFtKjw==" +- }, +- "node_modules/acorn": { +- "version": "7.4.1", ++ "node_modules/asynckit": { ++ "version": "0.4.0", ++ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", ++ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true, - "license": "MIT", +- "bin": { +- "acorn": "bin/acorn" +- }, +- "engines": { +- "node": ">=0.4.0" +- } ++ "license": "MIT" + }, +- "node_modules/acorn-jsx": { +- "version": "5.3.2", ++ "node_modules/at-least-node": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", ++ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, +- "license": "MIT", +- "peerDependencies": { +- "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" ++ "license": "ISC", ++ "engines": { ++ "node": ">= 4.0.0" + } + }, +- "node_modules/acorn-walk": { +- "version": "8.3.0", +- "dev": true, ++ "node_modules/atomically": { ++ "version": "1.7.0", ++ "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz", ++ "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==", + "license": "MIT", + "engines": { +- "node": ">=0.4.0" ++ "node": ">=10.12.0" + } + }, +- "node_modules/add-stream": { +- "version": "1.0.0", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/agent-base": { +- "version": "6.0.2", ++ "node_modules/available-typed-arrays": { ++ "version": "1.0.7", ++ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", ++ "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { +- "debug": "4" ++ "possible-typed-array-names": "^1.0.0" + }, + "engines": { +- "node": ">= 6.0.0" +- } ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } + }, +- "node_modules/ajv": { +- "version": "6.12.6", ++ "node_modules/babel-loader": { ++ "version": "8.2.5", ++ "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", ++ "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", + "license": "MIT", + "dependencies": { +- "fast-deep-equal": "^3.1.1", +- "fast-json-stable-stringify": "^2.0.0", +- "json-schema-traverse": "^0.4.1", +- "uri-js": "^4.2.2" ++ "find-cache-dir": "^3.3.1", ++ "loader-utils": "^2.0.0", ++ "make-dir": "^3.1.0", ++ "schema-utils": "^2.6.5" + }, +- "funding": { +- "type": "github", +- "url": "https://github.com/sponsors/epoberezkin" ++ "engines": { ++ "node": ">= 8.9" ++ }, ++ "peerDependencies": { ++ "@babel/core": "^7.0.0", ++ "webpack": ">=2" + } + }, +- "node_modules/ajv-formats": { +- "version": "2.1.1", ++ "node_modules/babel-plugin-polyfill-corejs2": { ++ "version": "0.2.3", ++ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz", ++ "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "ajv": "^8.0.0" ++ "@babel/compat-data": "^7.13.11", ++ "@babel/helper-define-polyfill-provider": "^0.2.4", ++ "semver": "^6.1.1" + }, + "peerDependencies": { +- "ajv": "^8.0.0" +- }, +- "peerDependenciesMeta": { +- "ajv": { +- "optional": true +- } ++ "@babel/core": "^7.0.0-0" + } + }, +- "node_modules/ajv-formats/node_modules/ajv": { +- "version": "8.12.0", ++ "node_modules/babel-plugin-polyfill-corejs3": { ++ "version": "0.2.5", ++ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz", ++ "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" ++ "@babel/helper-define-polyfill-provider": "^0.2.2", ++ "core-js-compat": "^3.16.2" + }, +- "funding": { +- "type": "github", +- "url": "https://github.com/sponsors/epoberezkin" ++ "peerDependencies": { ++ "@babel/core": "^7.0.0-0" + } + }, +- "node_modules/ajv-formats/node_modules/json-schema-traverse": { +- "version": "1.0.0", +- "license": "MIT" +- }, +- "node_modules/ajv-keywords": { +- "version": "3.5.2", + "node_modules/babel-plugin-polyfill-regenerator": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz", + "integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==", + "dev": true, - "dependencies": { -- "@webassemblyjs/ast": "1.12.1", -- "@webassemblyjs/helper-buffer": "1.12.1", -- "@webassemblyjs/wasm-gen": "1.12.1", -- "@webassemblyjs/wasm-parser": "1.12.1" + "license": "MIT", ++ "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.2.4" + }, -+ "peerDependencies": { + "peerDependencies": { +- "ajv": "^6.9.1" + "@babel/core": "^7.0.0-0" } }, -- "node_modules/@webassemblyjs/wasm-parser": { -- "version": "1.12.1", -- "license": "MIT", +- "node_modules/all-contributors-cli": { +- "version": "6.20.5", + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" ++ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", ++ "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", @@ -6736,318 +6957,31 @@ index a38125e..a1067b0 100644 + "type": "consulting", + "url": "https://feross.org/support" + } -+ ] ++ ], ++ "license": "MIT" + }, + "node_modules/batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", -+ "dev": true + "dev": true, ++ "license": "MIT" + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "dependencies": { -- "@webassemblyjs/ast": "1.12.1", -- "@webassemblyjs/helper-api-error": "1.11.6", -- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", -- "@webassemblyjs/ieee754": "1.11.6", -- "@webassemblyjs/leb128": "1.11.6", -- "@webassemblyjs/utf8": "1.11.6" ++ "license": "BSD-3-Clause", ++ "dependencies": { + "tweetnacl": "^0.14.3" - } - }, -- "node_modules/@webassemblyjs/wast-printer": { -- "version": "1.12.1", -- "license": "MIT", ++ } ++ }, + "node_modules/better-sqlite3": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-10.0.0.tgz", + "integrity": "sha512-rOz0JY8bt9oMgrFssP7GnvA5R3yln73y/NizzWqy3WlFth8Ux8+g4r/N9fjX97nn4X1YX6MTER2doNpTu5pqiA==", + "hasInstallScript": true, - "dependencies": { -- "@webassemblyjs/ast": "1.12.1", -- "@xtuc/long": "4.2.2" -+ "bindings": "^1.5.0", -+ "prebuild-install": "^7.1.1" - } - }, -- "node_modules/@webpack-cli/configtest": { -- "version": "1.2.0", -- "license": "MIT", -- "peerDependencies": { -- "webpack": "4.x.x || 5.x.x", -- "webpack-cli": "4.x.x" -+ "node_modules/big-integer": { -+ "version": "1.6.52", -+ "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", -+ "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", -+ "engines": { -+ "node": ">=0.6" - } - }, -- "node_modules/@webpack-cli/info": { -- "version": "1.5.0", -- "license": "MIT", -- "dependencies": { -- "envinfo": "^7.7.3" -- }, -- "peerDependencies": { -- "webpack-cli": "4.x.x" -+ "node_modules/big.js": { -+ "version": "5.2.2", -+ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", -+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", -+ "engines": { -+ "node": "*" - } - }, -- "node_modules/@webpack-cli/serve": { -- "version": "1.7.0", -- "license": "MIT", -- "peerDependencies": { -- "webpack-cli": "4.x.x" -+ "node_modules/binary-extensions": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", -+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", -+ "engines": { -+ "node": ">=8" - }, -- "peerDependenciesMeta": { -- "webpack-dev-server": { -- "optional": true -- } -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/@xmldom/xmldom": { -- "version": "0.8.10", -- "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">=10.0.0" -+ "node_modules/bindings": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", -+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", -+ "dependencies": { -+ "file-uri-to-path": "1.0.0" - } - }, -- "node_modules/@xtuc/ieee754": { -- "version": "1.2.0", -- "license": "BSD-3-Clause" -- }, -- "node_modules/@xtuc/long": { -- "version": "4.2.2", -- "license": "Apache-2.0" -+ "node_modules/bl": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", -+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", -+ "dependencies": { -+ "buffer": "^5.5.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.4.0" -+ } - }, -- "node_modules/7zip-bin": { -- "version": "5.2.0", -- "dev": true, -- "license": "MIT" -+ "node_modules/bluebird": { -+ "version": "3.7.2", -+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", -+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", -+ "dev": true - }, -- "node_modules/accepts": { -- "version": "1.3.8", -+ "node_modules/bluebird-lst": { -+ "version": "1.0.9", -+ "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz", -+ "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "mime-types": "~2.1.34", -- "negotiator": "0.6.3" -- }, -- "engines": { -- "node": ">= 0.6" -+ "bluebird": "^3.5.5" - } - }, -- "node_modules/ace-builds": { -- "version": "1.34.1", -- "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.1.tgz", -- "integrity": "sha512-hwRzr6BkRwsq5A19yA9E36KNNtn0+zESYolnWK3TADJsWVQS0T24nvbgdjXwqk2JEMQXE4PlqAw+ZgprvFtKjw==" -- }, -- "node_modules/acorn": { -- "version": "7.4.1", -+ "node_modules/body-parser": { -+ "version": "1.20.2", -+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", -+ "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", - "dev": true, -- "license": "MIT", -- "bin": { -- "acorn": "bin/acorn" -+ "dependencies": { -+ "bytes": "3.1.2", -+ "content-type": "~1.0.5", -+ "debug": "2.6.9", -+ "depd": "2.0.0", -+ "destroy": "1.2.0", -+ "http-errors": "2.0.0", -+ "iconv-lite": "0.4.24", -+ "on-finished": "2.4.1", -+ "qs": "6.11.0", -+ "raw-body": "2.5.2", -+ "type-is": "~1.6.18", -+ "unpipe": "1.0.0" - }, - "engines": { -- "node": ">=0.4.0" -- } -- }, -- "node_modules/acorn-jsx": { -- "version": "5.3.2", -- "dev": true, -- "license": "MIT", -- "peerDependencies": { -- "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" -+ "node": ">= 0.8", -+ "npm": "1.2.8000 || >= 1.4.16" - } - }, -- "node_modules/acorn-walk": { -- "version": "8.3.0", -+ "node_modules/body-parser/node_modules/bytes": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", -+ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=0.4.0" -+ "node": ">= 0.8" - } - }, -- "node_modules/add-stream": { -- "version": "1.0.0", -- "dev": true, -- "license": "MIT" -- }, -- "node_modules/agent-base": { -- "version": "6.0.2", -+ "node_modules/body-parser/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "debug": "4" -- }, -- "engines": { -- "node": ">= 6.0.0" -+ "ms": "2.0.0" - } - }, -- "node_modules/ajv": { -- "version": "6.12.6", -- "license": "MIT", -+ "node_modules/body-parser/node_modules/iconv-lite": { -+ "version": "0.4.24", -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", -+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", -+ "dev": true, - "dependencies": { -- "fast-deep-equal": "^3.1.1", -- "fast-json-stable-stringify": "^2.0.0", -- "json-schema-traverse": "^0.4.1", -- "uri-js": "^4.2.2" -+ "safer-buffer": ">= 2.1.2 < 3" - }, -- "funding": { -- "type": "github", -- "url": "https://github.com/sponsors/epoberezkin" -+ "engines": { -+ "node": ">=0.10.0" - } - }, -- "node_modules/ajv-formats": { -- "version": "2.1.1", -- "license": "MIT", -- "dependencies": { -- "ajv": "^8.0.0" -- }, -- "peerDependencies": { -- "ajv": "^8.0.0" -- }, -- "peerDependenciesMeta": { -- "ajv": { -- "optional": true -- } -- } -+ "node_modules/body-parser/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true - }, -- "node_modules/ajv-formats/node_modules/ajv": { -- "version": "8.12.0", -- "license": "MIT", -+ "node_modules/bonjour-service": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", -+ "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", -+ "dev": true, - "dependencies": { -- "fast-deep-equal": "^3.1.1", -- "json-schema-traverse": "^1.0.0", -- "require-from-string": "^2.0.2", -- "uri-js": "^4.2.2" -- }, -- "funding": { -- "type": "github", -- "url": "https://github.com/sponsors/epoberezkin" -+ "fast-deep-equal": "^3.1.3", -+ "multicast-dns": "^7.2.5" - } - }, -- "node_modules/ajv-formats/node_modules/json-schema-traverse": { -+ "node_modules/boolbase": { - "version": "1.0.0", -- "license": "MIT" -+ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", -+ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" - }, -- "node_modules/ajv-keywords": { -- "version": "3.5.2", -- "license": "MIT", -- "peerDependencies": { -- "ajv": "^6.9.1" -- } -+ "node_modules/boolean": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", -+ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", -+ "optional": true - }, -- "node_modules/all-contributors-cli": { -- "version": "6.20.5", -+ "node_modules/brace-expansion": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", -+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/runtime": "^7.7.6", - "async": "^3.1.0", @@ -7063,48 +6997,253 @@ index a38125e..a1067b0 100644 - "bin": { - "all-contributors": "dist/cli.js" - }, -- "engines": { ++ "bindings": "^1.5.0", ++ "prebuild-install": "^7.1.1" ++ } ++ }, ++ "node_modules/big-integer": { ++ "version": "1.6.52", ++ "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", ++ "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", ++ "license": "Unlicense", + "engines": { - "node": ">=4" -- } -- }, ++ "node": ">=0.6" + } + }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "dev": true, -- "license": "MIT", -- "engines": { ++ "node_modules/big.js": { ++ "version": "5.2.2", ++ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", ++ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "license": "MIT", + "engines": { - "node": ">=6" -+ "balanced-match": "^1.0.0" ++ "node": "*" } }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "dev": true, -- "license": "MIT", -+ "node_modules/braces": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", -+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dependencies": { ++ "node_modules/binary-extensions": { ++ "version": "2.3.0", ++ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", ++ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "license": "MIT", +- "dependencies": { - "type-fest": "^0.21.3" -+ "fill-range": "^7.1.1" - }, +- }, "engines": { "node": ">=8" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" + }, +@@ -4656,107 +5483,290 @@ + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", -- "dev": true, ++ "node_modules/bindings": { ++ "version": "1.5.0", ++ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", ++ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", ++ "license": "MIT", ++ "dependencies": { ++ "file-uri-to-path": "1.0.0" ++ } ++ }, ++ "node_modules/bl": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", ++ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", ++ "license": "MIT", ++ "dependencies": { ++ "buffer": "^5.5.0", ++ "inherits": "^2.0.4", ++ "readable-stream": "^3.4.0" ++ } ++ }, ++ "node_modules/bluebird": { ++ "version": "3.7.2", ++ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", ++ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "license": "MIT" ++ }, ++ "node_modules/bluebird-lst": { ++ "version": "1.0.9", ++ "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz", ++ "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "bluebird": "^3.5.5" + } + }, +- "node_modules/ansi-html-community": { +- "version": "0.0.8", ++ "node_modules/body-parser": { ++ "version": "1.20.3", ++ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", ++ "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "dev": true, +- "engines": [ +- "node >= 0.8.0" +- ], +- "license": "Apache-2.0", +- "bin": { +- "ansi-html": "bin/ansi-html" ++ "license": "MIT", ++ "dependencies": { ++ "bytes": "3.1.2", ++ "content-type": "~1.0.5", ++ "debug": "2.6.9", ++ "depd": "2.0.0", ++ "destroy": "1.2.0", ++ "http-errors": "2.0.0", ++ "iconv-lite": "0.4.24", ++ "on-finished": "2.4.1", ++ "qs": "6.13.0", ++ "raw-body": "2.5.2", ++ "type-is": "~1.6.18", ++ "unpipe": "1.0.0" ++ }, ++ "engines": { ++ "node": ">= 0.8", ++ "npm": "1.2.8000 || >= 1.4.16" + } + }, +- "node_modules/ansi-regex": { +- "version": "5.0.1", ++ "node_modules/body-parser/node_modules/bytes": { ++ "version": "3.1.2", ++ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", ++ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", ++ "dev": true, + "license": "MIT", + "engines": { +- "node": ">=8" ++ "node": ">= 0.8" + } + }, +- "node_modules/ansi-styles": { +- "version": "4.3.0", ++ "node_modules/body-parser/node_modules/debug": { ++ "version": "2.6.9", ++ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", ++ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "color-convert": "^2.0.1" +- }, +- "engines": { +- "node": ">=8" +- }, +- "funding": { +- "url": "https://github.com/chalk/ansi-styles?sponsor=1" ++ "ms": "2.0.0" + } + }, +- "node_modules/anymatch": { +- "version": "3.1.3", +- "license": "ISC", ++ "node_modules/body-parser/node_modules/iconv-lite": { ++ "version": "0.4.24", ++ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", ++ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", ++ "dev": true, ++ "license": "MIT", + "dependencies": { +- "normalize-path": "^3.0.0", +- "picomatch": "^2.0.4" ++ "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { +- "node": ">= 8" ++ "node": ">=0.10.0" + } + }, +- "node_modules/app-builder-bin": { +- "version": "4.0.0", ++ "node_modules/body-parser/node_modules/ms": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", ++ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, +- "node_modules/app-builder-lib": { +- "version": "24.13.3", ++ "node_modules/bonjour-service": { ++ "version": "1.2.1", ++ "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", ++ "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@develar/schema-utils": "~2.6.5", +- "@electron/notarize": "2.2.1", +- "@electron/osx-sign": "1.0.5", +- "@electron/universal": "1.5.1", +- "@malept/flatpak-bundler": "^0.4.0", +- "@types/fs-extra": "9.0.13", +- "async-exit-hook": "^2.0.1", +- "bluebird-lst": "^1.0.9", +- "builder-util": "24.13.1", +- "builder-util-runtime": "9.2.4", +- "chromium-pickle-js": "^0.2.0", ++ "fast-deep-equal": "^3.1.3", ++ "multicast-dns": "^7.2.5" ++ } ++ }, ++ "node_modules/boolbase": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", ++ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", ++ "license": "ISC" ++ }, ++ "node_modules/boolean": { ++ "version": "3.2.0", ++ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", ++ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", ++ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", ++ "license": "MIT", ++ "optional": true ++ }, ++ "node_modules/brace-expansion": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", ++ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "balanced-match": "^1.0.0" ++ } ++ }, ++ "node_modules/braces": { ++ "version": "3.0.3", ++ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", ++ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", ++ "license": "MIT", ++ "dependencies": { ++ "fill-range": "^7.1.1" ++ }, ++ "engines": { ++ "node": ">=8" ++ } ++ }, + "node_modules/browserslist": { -+ "version": "4.23.3", -+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", -+ "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", ++ "version": "4.24.0", ++ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", ++ "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", + "funding": [ + { + "type": "opencollective", @@ -7119,26 +7258,20 @@ index a38125e..a1067b0 100644 + "url": "https://github.com/sponsors/ai" + } + ], ++ "license": "MIT", + "dependencies": { -+ "caniuse-lite": "^1.0.30001646", -+ "electron-to-chromium": "^1.5.4", ++ "caniuse-lite": "^1.0.30001663", ++ "electron-to-chromium": "^1.5.28", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" - }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" ++ }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, -- "node_modules/ansi-html-community": { -- "version": "0.0.8", -- "dev": true, -- "engines": [ -- "node >= 0.8.0" ++ } ++ }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -7156,96 +7289,61 @@ index a38125e..a1067b0 100644 + "type": "consulting", + "url": "https://feross.org/support" + } - ], -- "license": "Apache-2.0", -- "bin": { -- "ansi-html": "bin/ansi-html" ++ ], ++ "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" - } - }, -- "node_modules/ansi-regex": { -- "version": "5.0.1", -- "license": "MIT", ++ } ++ }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "engines": { -- "node": ">=8" ++ "license": "MIT", ++ "engines": { + "node": "*" - } - }, -- "node_modules/ansi-styles": { -- "version": "4.3.0", -- "license": "MIT", -- "dependencies": { -- "color-convert": "^2.0.1" -- }, ++ } ++ }, + "node_modules/buffer-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz", + "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==", + "dev": true, - "engines": { -- "node": ">=8" ++ "license": "MIT", ++ "engines": { + "node": ">=0.4" - }, - "funding": { -- "url": "https://github.com/chalk/ansi-styles?sponsor=1" ++ }, ++ "funding": { + "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/anymatch": { -- "version": "3.1.3", -- "license": "ISC", -- "dependencies": { -- "normalize-path": "^3.0.0", -- "picomatch": "^2.0.4" -- }, ++ } ++ }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", -+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" ++ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", ++ "license": "MIT" + }, + "node_modules/buildcheck": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", - "engines": { -- "node": ">= 8" ++ "engines": { + "node": ">=10.0.0" - } - }, -- "node_modules/app-builder-bin": { -- "version": "4.0.0", -- "dev": true, -- "license": "MIT" -- }, -- "node_modules/app-builder-lib": { -- "version": "24.13.3", ++ } ++ }, + "node_modules/builder-util": { + "version": "24.13.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.13.1.tgz", + "integrity": "sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "@develar/schema-utils": "~2.6.5", -- "@electron/notarize": "2.2.1", -- "@electron/osx-sign": "1.0.5", -- "@electron/universal": "1.5.1", -- "@malept/flatpak-bundler": "^0.4.0", -- "@types/fs-extra": "9.0.13", -- "async-exit-hook": "^2.0.1", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { + "@types/debug": "^4.1.6", + "7zip-bin": "~5.2.0", + "app-builder-bin": "4.0.0", - "bluebird-lst": "^1.0.9", -- "builder-util": "24.13.1", - "builder-util-runtime": "9.2.4", -- "chromium-pickle-js": "^0.2.0", ++ "bluebird-lst": "^1.0.9", ++ "builder-util-runtime": "9.2.4", + "chalk": "^4.1.2", + "cross-spawn": "^7.0.3", "debug": "^4.3.4", @@ -7275,6 +7373,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz", + "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "debug": "^4.3.4", + "sax": "^1.2.4" @@ -7294,11 +7393,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", -@@ -4768,10 +5334,11 @@ +@@ -4768,8 +5778,10 @@ "node": ">=12" } }, @@ -7308,44 +7405,50 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "universalify": "^2.0.0" - }, -@@ -4779,141 +5346,74 @@ +@@ -4779,1472 +5791,1586 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/app-builder-lib/node_modules/semver": { - "version": "7.6.2", -- "dev": true, ++ "node_modules/builder-util/node_modules/universalify": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", ++ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, -- "engines": { -- "node": ">=10" -- } -- }, -- "node_modules/app-builder-lib/node_modules/universalify": { -+ "node_modules/builder-util/node_modules/universalify": { - "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", -+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, -- "license": "MIT", ++ "license": "MIT", "engines": { - "node": ">= 10.0.0" +- "node": ">=10" ++ "node": ">= 10.0.0" } }, -- "node_modules/archiver": { -- "version": "5.3.2", +- "node_modules/app-builder-lib/node_modules/universalify": { +- "version": "2.0.1", + "node_modules/bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", "dev": true, -- "license": "MIT", + "license": "MIT", + "engines": { +- "node": ">= 10.0.0" ++ "node": ">= 0.8" + } + }, +- "node_modules/archiver": { +- "version": "5.3.2", +- "dev": true, ++ "node_modules/cacheable-lookup": { ++ "version": "5.0.4", ++ "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", ++ "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "license": "MIT", - "peer": true, - "dependencies": { - "archiver-utils": "^2.1.0", @@ -7358,15 +7461,19 @@ index a38125e..a1067b0 100644 - }, "engines": { - "node": ">= 10" -+ "node": ">= 0.8" ++ "node": ">=10.6.0" } }, - "node_modules/archiver-utils": { - "version": "2.1.0", - "dev": true, -- "license": "MIT", ++ "node_modules/cacheable-request": { ++ "version": "7.0.4", ++ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", ++ "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", + "license": "MIT", - "peer": true, -- "dependencies": { + "dependencies": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", @@ -7377,54 +7484,6 @@ index a38125e..a1067b0 100644 - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" -- }, -+ "node_modules/cacheable-lookup": { -+ "version": "5.0.4", -+ "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", -+ "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "engines": { -- "node": ">= 6" -- } -- }, -- "node_modules/archiver-utils/node_modules/isarray": { -- "version": "1.0.0", -- "dev": true, -- "license": "MIT", -- "peer": true -- }, -- "node_modules/archiver-utils/node_modules/readable-stream": { -- "version": "2.3.8", -- "dev": true, -- "license": "MIT", -- "peer": true, -- "dependencies": { -- "core-util-is": "~1.0.0", -- "inherits": "~2.0.3", -- "isarray": "~1.0.0", -- "process-nextick-args": "~2.0.0", -- "safe-buffer": "~5.1.1", -- "string_decoder": "~1.1.1", -- "util-deprecate": "~1.0.1" -+ "node": ">=10.6.0" - } - }, -- "node_modules/archiver-utils/node_modules/safe-buffer": { -- "version": "5.1.2", -- "dev": true, -- "license": "MIT", -- "peer": true -- }, -- "node_modules/archiver-utils/node_modules/string_decoder": { -- "version": "1.1.1", -- "dev": true, -- "license": "MIT", -- "peer": true, -+ "node_modules/cacheable-request": { -+ "version": "7.0.4", -+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", -+ "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", - "dependencies": { -- "safe-buffer": "~5.1.0" + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", @@ -7432,9 +7491,87 @@ index a38125e..a1067b0 100644 + "lowercase-keys": "^2.0.0", + "normalize-url": "^6.0.1", + "responselike": "^2.0.0" + }, + "engines": { +- "node": ">= 6" ++ "node": ">=8" + } + }, +- "node_modules/archiver-utils/node_modules/isarray": { +- "version": "1.0.0", +- "dev": true, ++ "node_modules/cacheable-request/node_modules/get-stream": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", ++ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "license": "MIT", +- "peer": true ++ "dependencies": { ++ "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } + }, +- "node_modules/archiver-utils/node_modules/readable-stream": { +- "version": "2.3.8", ++ "node_modules/call-bind": { ++ "version": "1.0.7", ++ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", ++ "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "license": "MIT", +- "peer": true, + "dependencies": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" ++ "es-define-property": "^1.0.0", ++ "es-errors": "^1.3.0", ++ "function-bind": "^1.1.2", ++ "get-intrinsic": "^1.2.4", ++ "set-function-length": "^1.2.1" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" + } + }, +- "node_modules/archiver-utils/node_modules/safe-buffer": { +- "version": "5.1.2", ++ "node_modules/callsites": { ++ "version": "3.1.0", ++ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", ++ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", +- "peer": true ++ "engines": { ++ "node": ">=6" ++ } + }, +- "node_modules/archiver-utils/node_modules/string_decoder": { +- "version": "1.1.1", +- "dev": true, ++ "node_modules/camel-case": { ++ "version": "4.1.2", ++ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", ++ "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "license": "MIT", +- "peer": true, + "dependencies": { +- "safe-buffer": "~5.1.0" ++ "pascal-case": "^3.1.2", ++ "tslib": "^2.0.3" } }, - "node_modules/arg": { @@ -7448,23 +7585,20 @@ index a38125e..a1067b0 100644 - }, - "node_modules/array-buffer-byte-length": { - "version": "1.0.0", -- "dev": true, -- "license": "MIT", -+ "node_modules/cacheable-request/node_modules/get-stream": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", -+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dependencies": { ++ "node_modules/camelcase": { ++ "version": "5.3.1", ++ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", ++ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "license": "MIT", +- "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" -+ "pump": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" - }, - "funding": { +- }, +- "funding": { - "url": "https://github.com/sponsors/ljharb" -+ "url": "https://github.com/sponsors/sindresorhus" ++ "engines": { ++ "node": ">=6" } }, - "node_modules/array-flatten": { @@ -7479,90 +7613,18 @@ index a38125e..a1067b0 100644 - }, - "node_modules/array-includes": { - "version": "3.1.7", -+ "node_modules/call-bind": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", -+ "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", ++ "node_modules/camelcase-keys": { ++ "version": "6.2.2", ++ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", ++ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-string": "^1.0.7" -+ "es-define-property": "^1.0.0", -+ "es-errors": "^1.3.0", -+ "function-bind": "^1.1.2", -+ "get-intrinsic": "^1.2.4", -+ "set-function-length": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" -@@ -4922,1200 +5422,1504 @@ - "url": "https://github.com/sponsors/ljharb" - } - }, -- "node_modules/array-union": { -- "version": "2.1.0", -+ "node_modules/callsites": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=8" -+ "node": ">=6" - } - }, -- "node_modules/array.prototype.flat": { -- "version": "1.3.2", -- "dev": true, -- "license": "MIT", -+ "node_modules/camel-case": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", -+ "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dependencies": { -- "call-bind": "^1.0.2", -- "define-properties": "^1.2.0", -- "es-abstract": "^1.22.1", -- "es-shim-unscopables": "^1.0.0" -- }, -+ "pascal-case": "^3.1.2", -+ "tslib": "^2.0.3" -+ } -+ }, -+ "node_modules/camelcase": { -+ "version": "5.3.1", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", -+ "dev": true, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=6" - } - }, -- "node_modules/arraybuffer.prototype.slice": { -- "version": "1.0.2", -+ "node_modules/camelcase-keys": { -+ "version": "6.2.2", -+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", -+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "array-buffer-byte-length": "^1.0.0", -- "call-bind": "^1.0.2", -- "define-properties": "^1.2.0", -- "es-abstract": "^1.22.1", -- "get-intrinsic": "^1.2.1", -- "is-array-buffer": "^3.0.2", -- "is-shared-array-buffer": "^1.0.2" + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" @@ -7576,29 +7638,25 @@ index a38125e..a1067b0 100644 + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/arrify": { -- "version": "1.0.1", +- "node_modules/array-union": { +- "version": "2.1.0", + "node_modules/camelcase-keys/node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { -- "node": ">=0.10.0" -+ "node": ">=8" + "node": ">=8" } }, -- "node_modules/asn1": { -- "version": "0.2.6", -- "license": "MIT", -- "dependencies": { -- "safer-buffer": "~2.1.0" -- } +- "node_modules/array.prototype.flat": { +- "version": "1.3.2", +- "dev": true, + "node_modules/caniuse-lite": { -+ "version": "1.0.30001653", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz", -+ "integrity": "sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==", ++ "version": "1.0.30001669", ++ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz", ++ "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==", + "funding": [ + { + "type": "opencollective", @@ -7612,47 +7670,53 @@ index a38125e..a1067b0 100644 + "type": "github", + "url": "https://github.com/sponsors/ai" + } -+ ] - }, -- "node_modules/astral-regex": { -- "version": "2.0.0", -- "dev": true, -- "license": "MIT", ++ ], ++ "license": "CC-BY-4.0" ++ }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1", +- "es-shim-unscopables": "^1.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" -+ }, + }, "engines": { -- "node": ">=8" +- "node": ">= 0.4" + "node": ">=10" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, -- "node_modules/async": { -- "version": "3.2.5", -- "dev": true, -- "license": "MIT" +- "node_modules/arraybuffer.prototype.slice": { +- "version": "1.0.2", + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", -+ "dev": true - }, -- "node_modules/async-exit-hook": { -- "version": "2.0.1", -- "dev": true, -- "license": "MIT", + "dev": true, ++ "license": "MIT" ++ }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "array-buffer-byte-length": "^1.0.0", +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1", +- "get-intrinsic": "^1.2.1", +- "is-array-buffer": "^3.0.2", +- "is-shared-array-buffer": "^1.0.2" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", @@ -7660,89 +7724,193 @@ index a38125e..a1067b0 100644 + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" -+ }, + }, "engines": { -- "node": ">=0.12.0" +- "node": ">= 0.4" + "node": ">= 8.10.0" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/ljharb" + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" } }, -- "node_modules/asynckit": { -- "version": "0.4.0", -- "dev": true, -- "license": "MIT" -- }, -- "node_modules/at-least-node": { -- "version": "1.0.0", +- "node_modules/arrify": { +- "version": "1.0.1", + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, -- "license": "ISC", +- "license": "MIT", ++ "license": "ISC", "engines": { -- "node": ">= 4.0.0" +- "node": ">=0.10.0" + "node": ">=10" } }, -- "node_modules/atomically": { -- "version": "1.7.0", -- "license": "MIT", +- "node_modules/asn1": { +- "version": "0.2.6", + "node_modules/chrome-trace-event": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", + "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", - "engines": { -- "node": ">=10.12.0" + "license": "MIT", +- "dependencies": { +- "safer-buffer": "~2.1.0" ++ "engines": { + "node": ">=6.0" } }, -- "node_modules/available-typed-arrays": { -- "version": "1.0.5", +- "node_modules/astral-regex": { +- "version": "2.0.0", + "node_modules/chromium-pickle-js": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", + "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==", -+ "dev": true ++ "dev": true, ++ "license": "MIT" + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, -- "license": "MIT", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=8" + "node": ">=8" } }, -- "node_modules/babel-loader": { -- "version": "8.2.5", -- "license": "MIT", +- "node_modules/async": { +- "version": "3.2.5", +- "dev": true, +- "license": "MIT" + "node_modules/clean-css": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", + "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", ++ "license": "MIT", ++ "dependencies": { ++ "source-map": "~0.6.0" ++ }, ++ "engines": { ++ "node": ">= 10.0" ++ } + }, +- "node_modules/async-exit-hook": { +- "version": "2.0.1", ++ "node_modules/cli-cursor": { ++ "version": "3.1.0", ++ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", ++ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "license": "MIT", ++ "dependencies": { ++ "restore-cursor": "^3.1.0" ++ }, + "engines": { +- "node": ">=0.12.0" ++ "node": ">=8" + } + }, +- "node_modules/asynckit": { +- "version": "0.4.0", ++ "node_modules/cli-truncate": { ++ "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", ++ "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "slice-ansi": "^3.0.0", ++ "string-width": "^4.2.0" ++ }, ++ "engines": { ++ "node": ">=8" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } + }, +- "node_modules/at-least-node": { +- "version": "1.0.0", ++ "node_modules/cli-width": { ++ "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", ++ "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "license": "ISC", + "engines": { +- "node": ">= 4.0.0" ++ "node": ">= 10" + } + }, +- "node_modules/atomically": { +- "version": "1.7.0", +- "license": "MIT", ++ "node_modules/cliui": { ++ "version": "8.0.1", ++ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", ++ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", ++ "dev": true, ++ "license": "ISC", ++ "dependencies": { ++ "string-width": "^4.2.0", ++ "strip-ansi": "^6.0.1", ++ "wrap-ansi": "^7.0.0" ++ }, + "engines": { +- "node": ">=10.12.0" ++ "node": ">=12" + } + }, +- "node_modules/available-typed-arrays": { +- "version": "1.0.5", ++ "node_modules/cliui/node_modules/wrap-ansi": { ++ "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", ++ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", ++ "dependencies": { ++ "ansi-styles": "^4.0.0", ++ "string-width": "^4.1.0", ++ "strip-ansi": "^6.0.0" ++ }, + "engines": { +- "node": ">= 0.4" ++ "node": ">=10" + }, + "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, +- "node_modules/babel-loader": { +- "version": "8.2.5", ++ "node_modules/clone-deep": { ++ "version": "4.0.1", ++ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", ++ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "license": "MIT", "dependencies": { - "find-cache-dir": "^3.3.1", - "loader-utils": "^2.0.0", - "make-dir": "^3.1.0", - "schema-utils": "^2.6.5" -+ "source-map": "~0.6.0" ++ "is-plain-object": "^2.0.4", ++ "kind-of": "^6.0.2", ++ "shallow-clone": "^3.0.0" }, "engines": { - "node": ">= 8.9" @@ -7750,68 +7918,64 @@ index a38125e..a1067b0 100644 - "peerDependencies": { - "@babel/core": "^7.0.0", - "webpack": ">=2" -+ "node": ">= 10.0" ++ "node": ">=6" } }, - "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.2.3", -+ "node_modules/cli-cursor": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", -+ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, -- "license": "MIT", +- "dev": true, ++ "node_modules/clone-deep/node_modules/is-plain-object": { ++ "version": "2.0.4", ++ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", ++ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.4", - "semver": "^6.1.1" -+ "restore-cursor": "^3.1.0" ++ "isobject": "^3.0.1" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { -+ "node": ">=8" ++ "node": ">=0.10.0" } }, - "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.2.5", -+ "node_modules/cli-truncate": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", -+ "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, -- "license": "MIT", -+ "optional": true, +- "dev": true, ++ "node_modules/clone-response": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", ++ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.2", - "core-js-compat": "^3.16.2" -+ "slice-ansi": "^3.0.0", -+ "string-width": "^4.2.0" ++ "mimic-response": "^1.0.0" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -+ "engines": { -+ "node": ">=8" -+ }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.2.3", -+ "node_modules/cli-width": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", -+ "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true, -- "license": "MIT", -- "dependencies": { +- "dev": true, ++ "node_modules/color-convert": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", ++ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.4" -- }, ++ "color-name": "~1.1.4" + }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { -+ "node": ">= 10" ++ "node": ">=7.0.0" } }, - "node_modules/balanced-match": { @@ -7834,40 +7998,44 @@ index a38125e..a1067b0 100644 - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -- }, ++ "node_modules/color-name": { ++ "version": "1.1.4", ++ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", ++ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, - "node_modules/batch": { - "version": "0.6.1", -+ "node_modules/cliui": { -+ "version": "8.0.1", -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", -+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", ++ "node_modules/colord": { ++ "version": "2.9.3", ++ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", ++ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", "dev": true, -- "license": "MIT" -- }, + "license": "MIT" + }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "license": "BSD-3-Clause", - "dependencies": { +- "dependencies": { - "tweetnacl": "^0.14.3" -+ "string-width": "^4.2.0", -+ "strip-ansi": "^6.0.1", -+ "wrap-ansi": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=12" - } +- } ++ "node_modules/colorette": { ++ "version": "2.0.20", ++ "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", ++ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", ++ "license": "MIT" }, - "node_modules/better-sqlite3": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-10.0.0.tgz", - "integrity": "sha512-rOz0JY8bt9oMgrFssP7GnvA5R3yln73y/NizzWqy3WlFth8Ux8+g4r/N9fjX97nn4X1YX6MTER2doNpTu5pqiA==", - "hasInstallScript": true, -+ "node_modules/cliui/node_modules/wrap-ansi": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", ++ "node_modules/combined-stream": { ++ "version": "1.0.8", ++ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", ++ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, ++ "license": "MIT", "dependencies": { - "bindings": "^1.5.0", - "prebuild-install": "^7.1.1" @@ -7876,127 +8044,102 @@ index a38125e..a1067b0 100644 - "node_modules/big-integer": { - "version": "1.6.52", - "license": "Unlicense", -+ "ansi-styles": "^4.0.0", -+ "string-width": "^4.1.0", -+ "strip-ansi": "^6.0.0" ++ "delayed-stream": "~1.0.0" + }, "engines": { - "node": ">=0.6" -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" ++ "node": ">= 0.8" } }, - "node_modules/big.js": { - "version": "5.2.2", -- "license": "MIT", -+ "node_modules/clone-deep": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", -+ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", -+ "dependencies": { -+ "is-plain-object": "^2.0.4", -+ "kind-of": "^6.0.2", -+ "shallow-clone": "^3.0.0" -+ }, ++ "node_modules/commander": { ++ "version": "5.1.0", ++ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", ++ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", ++ "dev": true, + "license": "MIT", "engines": { - "node": "*" -+ "node": ">=6" ++ "node": ">= 6" } }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "license": "MIT", -+ "node_modules/clone-deep/node_modules/is-plain-object": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", -+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", -+ "dependencies": { -+ "isobject": "^3.0.1" -+ }, - "engines": { +- "engines": { - "node": ">=8" -+ "node": ">=0.10.0" - } +- } ++ "node_modules/commondir": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", ++ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", ++ "license": "MIT" }, - "node_modules/bindings": { - "version": "1.5.0", -- "license": "MIT", -+ "node_modules/clone-response": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", -+ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", ++ "node_modules/compare-func": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", ++ "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", ++ "dev": true, + "license": "MIT", "dependencies": { - "file-uri-to-path": "1.0.0" -+ "mimic-response": "^1.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" ++ "array-ify": "^1.0.0", ++ "dot-prop": "^5.1.0" } }, - "node_modules/bl": { - "version": "4.1.0", -- "license": "MIT", -+ "node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { ++ "node_modules/compare-version": { ++ "version": "0.1.2", ++ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", ++ "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", ++ "dev": true, + "license": "MIT", +- "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" -+ "color-name": "~1.1.4" -+ }, + "engines": { -+ "node": ">=7.0.0" ++ "node": ">=0.10.0" } }, - "node_modules/bluebird": { - "version": "3.7.2", - "dev": true, - "license": "MIT" -+ "node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, +- }, - "node_modules/bluebird-lst": { - "version": "1.0.9", -+ "node_modules/colord": { -+ "version": "2.9.3", -+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", -+ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", -+ "dev": true -+ }, -+ "node_modules/colorette": { -+ "version": "2.0.20", -+ "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", -+ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" -+ }, -+ "node_modules/combined-stream": { -+ "version": "1.0.8", -+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", ++ "node_modules/compress-commons": { ++ "version": "4.1.2", ++ "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", ++ "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", "dev": true, -- "license": "MIT", + "license": "MIT", ++ "peer": true, "dependencies": { - "bluebird": "^3.5.5" -+ "delayed-stream": "~1.0.0" ++ "buffer-crc32": "^0.2.13", ++ "crc32-stream": "^4.0.2", ++ "normalize-path": "^3.0.0", ++ "readable-stream": "^3.6.0" + }, + "engines": { -+ "node": ">= 0.8" ++ "node": ">= 10" } }, - "node_modules/body-parser": { - "version": "1.20.2", -+ "node_modules/commander": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", -+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", ++ "node_modules/compressible": { ++ "version": "2.0.18", ++ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", ++ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, -- "license": "MIT", -- "dependencies": { + "license": "MIT", + "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", @@ -8009,86 +8152,22 @@ index a38125e..a1067b0 100644 - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" -- }, ++ "mime-db": ">= 1.43.0 < 2" + }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" -+ "node": ">= 6" ++ "node": ">= 0.6" } }, - "node_modules/body-parser/node_modules/bytes": { - "version": "3.1.2", -+ "node_modules/commondir": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", -+ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==" -+ }, -+ "node_modules/compare-func": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", -+ "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", -+ "dev": true, -+ "dependencies": { -+ "array-ify": "^1.0.0", -+ "dot-prop": "^5.1.0" -+ } -+ }, -+ "node_modules/compare-version": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", -+ "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">= 0.8" -+ "node": ">=0.10.0" - } - }, -- "node_modules/body-parser/node_modules/debug": { -- "version": "2.6.9", -+ "node_modules/compress-commons": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", -+ "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", - "dev": true, -- "license": "MIT", -+ "peer": true, - "dependencies": { -- "ms": "2.0.0" -+ "buffer-crc32": "^0.2.13", -+ "crc32-stream": "^4.0.2", -+ "normalize-path": "^3.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "engines": { -+ "node": ">= 10" - } - }, -- "node_modules/body-parser/node_modules/iconv-lite": { -- "version": "0.4.24", -+ "node_modules/compressible": { -+ "version": "2.0.18", -+ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", -+ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "safer-buffer": ">= 2.1.2 < 3" -+ "mime-db": ">= 1.43.0 < 2" - }, - "engines": { -- "node": ">=0.10.0" -+ "node": ">= 0.6" - } - }, -- "node_modules/body-parser/node_modules/ms": { -- "version": "2.0.0", + "node_modules/compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, -- "license": "MIT" + "license": "MIT", + "dependencies": { + "accepts": "~1.3.5", + "bytes": "3.0.0", @@ -8098,61 +8177,82 @@ index a38125e..a1067b0 100644 + "safe-buffer": "5.1.2", + "vary": "~1.1.2" + }, -+ "engines": { + "engines": { +- "node": ">= 0.8" + "node": ">= 0.8.0" -+ } + } }, -- "node_modules/bonjour-service": { -- "version": "1.1.1", +- "node_modules/body-parser/node_modules/debug": { + "node_modules/compression/node_modules/debug": { -+ "version": "2.6.9", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { + "ms": "2.0.0" + } + }, +- "node_modules/body-parser/node_modules/iconv-lite": { +- "version": "0.4.24", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "safer-buffer": ">= 2.1.2 < 3" +- }, +- "engines": { +- "node": ">=0.10.0" +- } +- }, +- "node_modules/body-parser/node_modules/ms": { ++ "node_modules/compression/node_modules/ms": { + "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", ++ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, +- "node_modules/bonjour-service": { +- "version": "1.1.1", ++ "node_modules/compression/node_modules/safe-buffer": { ++ "version": "5.1.2", ++ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", ++ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, +- "license": "MIT", +- "dependencies": { - "array-flatten": "^2.1.2", - "dns-equal": "^1.0.0", - "fast-deep-equal": "^3.1.3", - "multicast-dns": "^7.2.5" -+ "ms": "2.0.0" - } - }, +- } +- }, - "node_modules/boolbase": { - "version": "1.0.0", - "license": "ISC" -+ "node_modules/compression/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true ++ "license": "MIT" }, - "node_modules/boolean": { - "version": "3.2.0", - "license": "MIT", - "optional": true -+ "node_modules/compression/node_modules/safe-buffer": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", -+ "dev": true - }, -- "node_modules/brace-expansion": { -- "version": "2.0.1", + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" -+ }, ++ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", ++ "license": "MIT" + }, +- "node_modules/brace-expansion": { +- "version": "2.0.1", + "node_modules/concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", "dev": true, -- "license": "MIT", + "engines": [ + "node >= 6.0" + ], + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "buffer-from": "^1.0.0", @@ -8163,11 +8263,11 @@ index a38125e..a1067b0 100644 }, - "node_modules/braces": { - "version": "3.0.2", -- "license": "MIT", + "node_modules/conf": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/conf/-/conf-10.2.0.tgz", + "integrity": "sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg==", + "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "ajv": "^8.6.3", @@ -8205,27 +8305,37 @@ index a38125e..a1067b0 100644 - "url": "https://github.com/sponsors/ai" - } - ], -- "license": "MIT", + "node_modules/conf/node_modules/dot-prop": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", + "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" -- }, -- "bin": { -- "browserslist": "cli.js" + "is-obj": "^2.0.0" ++ }, ++ "engines": { ++ "node": ">=10" + }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/conf/node_modules/semver": { ++ "version": "7.6.3", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", ++ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", ++ "license": "ISC", + "bin": { +- "browserslist": "cli.js" ++ "semver": "bin/semver.js" }, "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/buffer": { @@ -8244,23 +8354,12 @@ index a38125e..a1067b0 100644 - "url": "https://feross.org/support" - } - ], -- "license": "MIT", -+ "node_modules/conf/node_modules/semver": { -+ "version": "7.6.3", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", -+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", -+ "bin": { -+ "semver": "bin/semver.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, + "node_modules/config-file-ts": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz", + "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==", + "dev": true, + "license": "MIT", "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" @@ -8278,6 +8377,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, ++ "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", @@ -8301,6 +8401,7 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, - "license": "MIT", ++ "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, @@ -8316,37 +8417,26 @@ index a38125e..a1067b0 100644 - "node_modules/buffer-from": { - "version": "1.1.2", - "license": "MIT" +- }, +- "node_modules/buildcheck": { +- "version": "0.0.6", + "node_modules/config-file-ts/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, -+ "engines": { -+ "node": ">=16 || 14 >=14.17" -+ } - }, -- "node_modules/buildcheck": { -- "version": "0.0.6", -+ "node_modules/config-file-ts/node_modules/typescript": { -+ "version": "5.5.4", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", -+ "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", -+ "dev": true, -+ "bin": { -+ "tsc": "bin/tsc", -+ "tsserver": "bin/tsserver" -+ }, ++ "license": "ISC", "engines": { - "node": ">=10.0.0" -+ "node": ">=14.17" ++ "node": ">=16 || 14 >=14.17" } }, - "node_modules/builder-util": { - "version": "24.13.1", -+ "node_modules/connect-history-api-fallback": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", -+ "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", ++ "node_modules/config-file-ts/node_modules/typescript": { ++ "version": "5.6.3", ++ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", ++ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, - "license": "MIT", - "dependencies": { @@ -8366,49 +8456,77 @@ index a38125e..a1067b0 100644 - "source-map-support": "^0.5.19", - "stat-mode": "^1.0.0", - "temp-file": "^3.4.0" ++ "license": "Apache-2.0", ++ "bin": { ++ "tsc": "bin/tsc", ++ "tsserver": "bin/tsserver" ++ }, + "engines": { -+ "node": ">=0.8" ++ "node": ">=14.17" } }, - "node_modules/builder-util-runtime": { - "version": "9.2.4", ++ "node_modules/connect-history-api-fallback": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", ++ "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", + "dev": true, + "license": "MIT", +- "dependencies": { +- "debug": "^4.3.4", +- "sax": "^1.2.4" +- }, + "engines": { +- "node": ">=12.0.0" ++ "node": ">=0.8" + } + }, +- "node_modules/builder-util/node_modules/fs-extra": { +- "version": "10.1.0", + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { -- "debug": "^4.3.4", -- "sax": "^1.2.4" +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" + "safe-buffer": "5.2.1" }, "engines": { -- "node": ">=12.0.0" +- "node": ">=12" + "node": ">= 0.6" } }, -- "node_modules/builder-util/node_modules/fs-extra": { -- "version": "10.1.0", +- "node_modules/builder-util/node_modules/jsonfile": { +- "version": "6.1.0", + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", -+ "dev": true, + "dev": true, + "license": "MIT", +- "dependencies": { +- "universalify": "^2.0.0" +- }, +- "optionalDependencies": { +- "graceful-fs": "^4.1.6" + "engines": { + "node": ">= 0.6" -+ } -+ }, + } + }, +- "node_modules/builder-util/node_modules/universalify": { +- "version": "2.0.1", + "node_modules/conventional-changelog": { + "version": "3.1.24", + "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz", + "integrity": "sha512-ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg==", "dev": true, -- "license": "MIT", - "dependencies": { -- "graceful-fs": "^4.2.0", -- "jsonfile": "^6.0.1", -- "universalify": "^2.0.0" + "license": "MIT", ++ "dependencies": { + "conventional-changelog-angular": "^5.0.12", + "conventional-changelog-atom": "^2.0.8", + "conventional-changelog-codemirror": "^2.0.8", @@ -8420,40 +8538,6 @@ index a38125e..a1067b0 100644 + "conventional-changelog-jquery": "^3.0.11", + "conventional-changelog-jshint": "^2.0.9", + "conventional-changelog-preset-loader": "^2.3.4" - }, - "engines": { -- "node": ">=12" -+ "node": ">=10" - } - }, -- "node_modules/builder-util/node_modules/jsonfile": { -- "version": "6.1.0", -+ "node_modules/conventional-changelog-angular": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", -+ "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "universalify": "^2.0.0" -+ "compare-func": "^2.0.0" - }, -- "optionalDependencies": { -- "graceful-fs": "^4.1.6" -+ "engines": { -+ "node": ">=16" - } - }, -- "node_modules/builder-util/node_modules/universalify": { -- "version": "2.0.1", -+ "node_modules/conventional-changelog-atom": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz", -+ "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==", - "dev": true, -- "license": "MIT", -+ "dependencies": { -+ "q": "^1.5.1" + }, "engines": { - "node": ">= 10.0.0" @@ -8462,50 +8546,47 @@ index a38125e..a1067b0 100644 }, - "node_modules/bytes": { - "version": "3.0.0", -+ "node_modules/conventional-changelog-codemirror": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz", -+ "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==", ++ "node_modules/conventional-changelog-angular": { ++ "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", ++ "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", "dev": true, - "license": "MIT", ++ "license": "ISC", + "dependencies": { -+ "q": "^1.5.1" ++ "compare-func": "^2.0.0" + }, "engines": { - "node": ">= 0.8" -+ "node": ">=10" ++ "node": ">=16" } }, - "node_modules/cacheable-lookup": { - "version": "5.0.4", - "license": "MIT", -+ "node_modules/conventional-changelog-config-spec": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz", -+ "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==", -+ "dev": true -+ }, -+ "node_modules/conventional-changelog-conventionalcommits": { -+ "version": "7.0.2", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz", -+ "integrity": "sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==", ++ "node_modules/conventional-changelog-atom": { ++ "version": "2.0.8", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz", ++ "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==", + "dev": true, ++ "license": "ISC", + "dependencies": { -+ "compare-func": "^2.0.0" ++ "q": "^1.5.1" + }, "engines": { - "node": ">=10.6.0" -+ "node": ">=16" ++ "node": ">=10" } }, - "node_modules/cacheable-request": { - "version": "7.0.4", - "license": "MIT", -+ "node_modules/conventional-changelog-core": { -+ "version": "4.2.4", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz", -+ "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==", ++ "node_modules/conventional-changelog-codemirror": { ++ "version": "2.0.8", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz", ++ "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==", + "dev": true, ++ "license": "ISC", "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", @@ -8514,6 +8595,50 @@ index a38125e..a1067b0 100644 - "lowercase-keys": "^2.0.0", - "normalize-url": "^6.0.1", - "responselike": "^2.0.0" ++ "q": "^1.5.1" + }, + "engines": { +- "node": ">=8" ++ "node": ">=10" + } + }, +- "node_modules/call-bind": { +- "version": "1.0.5", ++ "node_modules/conventional-changelog-config-spec": { ++ "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz", ++ "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==", + "dev": true, +- "license": "MIT", ++ "license": "MIT" ++ }, ++ "node_modules/conventional-changelog-conventionalcommits": { ++ "version": "7.0.2", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz", ++ "integrity": "sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==", ++ "dev": true, ++ "license": "ISC", + "dependencies": { +- "function-bind": "^1.1.2", +- "get-intrinsic": "^1.2.1", +- "set-function-length": "^1.1.1" ++ "compare-func": "^2.0.0" + }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "engines": { ++ "node": ">=16" + } + }, +- "node_modules/callsites": { +- "version": "3.1.0", ++ "node_modules/conventional-changelog-core": { ++ "version": "4.2.4", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz", ++ "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==", + "dev": true, + "license": "MIT", ++ "dependencies": { + "add-stream": "^1.0.0", + "conventional-changelog-writer": "^5.0.0", + "conventional-commits-parser": "^3.2.0", @@ -8528,33 +8653,30 @@ index a38125e..a1067b0 100644 + "read-pkg": "^3.0.0", + "read-pkg-up": "^3.0.0", + "through2": "^4.0.0" - }, ++ }, "engines": { -- "node": ">=8" +- "node": ">=6" + "node": ">=10" } }, -- "node_modules/call-bind": { -- "version": "1.0.5", +- "node_modules/camel-case": { +- "version": "4.1.2", + "node_modules/conventional-changelog-core/node_modules/conventional-commits-parser": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", + "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", - "dev": true, -- "license": "MIT", ++ "dev": true, + "license": "MIT", "dependencies": { -- "function-bind": "^1.1.2", -- "get-intrinsic": "^1.2.1", -- "set-function-length": "^1.1.1" +- "pascal-case": "^3.1.2", +- "tslib": "^2.0.3" + "is-text-path": "^1.0.1", + "JSONStream": "^1.0.4", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "split2": "^3.0.0", + "through2": "^4.0.0" - }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" ++ }, + "bin": { + "conventional-commits-parser": "cli.js" + }, @@ -8562,45 +8684,49 @@ index a38125e..a1067b0 100644 + "node": ">=10" } }, -- "node_modules/callsites": { -- "version": "3.1.0", +- "node_modules/camelcase": { +- "version": "5.3.1", + "node_modules/conventional-changelog-core/node_modules/dargs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", + "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" } }, -- "node_modules/camel-case": { -- "version": "4.1.2", -- "license": "MIT", +- "node_modules/camelcase-keys": { +- "version": "6.2.2", + "node_modules/conventional-changelog-core/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -+ "dev": true, + "dev": true, + "license": "MIT", "dependencies": { -- "pascal-case": "^3.1.2", -- "tslib": "^2.0.3" +- "camelcase": "^5.3.1", +- "map-obj": "^4.0.0", +- "quick-lru": "^4.0.1" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" + }, + "engines": { + "node": ">=8" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/camelcase": { -- "version": "5.3.1", +- "node_modules/camelcase-keys/node_modules/quick-lru": { +- "version": "4.0.1", + "node_modules/conventional-changelog-core/node_modules/git-raw-commits": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", + "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==", "dev": true, -- "license": "MIT", + "license": "MIT", + "dependencies": { + "dargs": "^7.0.0", + "lodash": "^4.17.15", @@ -8612,45 +8738,8 @@ index a38125e..a1067b0 100644 + "git-raw-commits": "cli.js" + }, "engines": { -- "node": ">=6" -+ "node": ">=10" - } - }, -- "node_modules/camelcase-keys": { -- "version": "6.2.2", -+ "node_modules/conventional-changelog-core/node_modules/is-text-path": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", -+ "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "camelcase": "^5.3.1", -- "map-obj": "^4.0.0", -- "quick-lru": "^4.0.1" -+ "text-extensions": "^1.0.0" - }, - "engines": { - "node": ">=8" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "node": ">=0.10.0" - } - }, -- "node_modules/camelcase-keys/node_modules/quick-lru": { -- "version": "4.0.1", -+ "node_modules/conventional-changelog-core/node_modules/locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, -- "license": "MIT", -+ "dependencies": { -+ "p-locate": "^4.1.0" -+ }, - "engines": { - "node": ">=8" ++ "node": ">=10" } }, - "node_modules/caniuse-lite": { @@ -8673,45 +8762,34 @@ index a38125e..a1067b0 100644 - }, - "node_modules/chalk": { - "version": "4.1.2", -- "license": "MIT", -+ "node_modules/conventional-changelog-core/node_modules/meow": { -+ "version": "8.1.2", -+ "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", -+ "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", ++ "node_modules/conventional-changelog-core/node_modules/is-text-path": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", ++ "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", + "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" -+ "@types/minimist": "^1.2.0", -+ "camelcase-keys": "^6.2.2", -+ "decamelize-keys": "^1.1.0", -+ "hard-rejection": "^2.1.0", -+ "minimist-options": "4.1.0", -+ "normalize-package-data": "^3.0.0", -+ "read-pkg-up": "^7.0.1", -+ "redent": "^3.0.0", -+ "trim-newlines": "^3.0.0", -+ "type-fest": "^0.18.0", -+ "yargs-parser": "^20.2.3" ++ "text-extensions": "^1.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { +- "node": ">=10" +- }, +- "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" -+ "url": "https://github.com/sponsors/sindresorhus" ++ "node": ">=0.10.0" } }, - "node_modules/chardet": { - "version": "0.7.0", -- "dev": true, ++ "node_modules/conventional-changelog-core/node_modules/locate-path": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", ++ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, - "license": "MIT" -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", -+ "dev": true - }, +- }, - "node_modules/chokidar": { - "version": "3.5.3", - "funding": [ @@ -8720,12 +8798,7 @@ index a38125e..a1067b0 100644 - "url": "https://paulmillr.com/funding/" - } - ], -- "license": "MIT", -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", -+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", -+ "dev": true, + "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", @@ -8734,10 +8807,7 @@ index a38125e..a1067b0 100644 - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" -+ "@types/normalize-package-data": "^2.4.0", -+ "normalize-package-data": "^2.5.0", -+ "parse-json": "^5.0.0", -+ "type-fest": "^0.6.0" ++ "p-locate": "^4.1.0" }, "engines": { - "node": ">= 8.10.0" @@ -8749,445 +8819,20 @@ index a38125e..a1067b0 100644 }, - "node_modules/chownr": { - "version": "2.0.0", -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg-up": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", -+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, -- "license": "ISC", -+ "dependencies": { -+ "find-up": "^4.1.0", -+ "read-pkg": "^5.2.0", -+ "type-fest": "^0.8.1" -+ }, - "engines": { -- "node": ">=10" -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/chrome-trace-event": { -- "version": "1.0.3", -- "license": "MIT", -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", -+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", -+ "dev": true, - "engines": { -- "node": ">=6.0" -+ "node": ">=8" - } - }, -- "node_modules/chromium-pickle-js": { -- "version": "0.2.0", -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, -- "license": "MIT" -+ "dependencies": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } - }, -- "node_modules/ci-info": { -- "version": "3.9.0", -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", -+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, -- "funding": [ -- { -- "type": "github", -- "url": "https://github.com/sponsors/sibiraj-s" -- } -- ], -- "license": "MIT", - "engines": { - "node": ">=8" - } - }, -- "node_modules/clean-css": { -- "version": "5.3.2", -- "license": "MIT", -+ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/semver": { -+ "version": "5.7.2", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", -+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", -+ "dev": true, -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", -+ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", -+ "dev": true, - "dependencies": { -- "source-map": "~0.6.0" -+ "hosted-git-info": "^4.0.1", -+ "is-core-module": "^2.5.0", -+ "semver": "^7.3.4", -+ "validate-npm-package-license": "^3.0.1" - }, - "engines": { -- "node": ">= 10.0" -+ "node": ">=10" - } - }, -- "node_modules/cli-cursor": { -- "version": "3.1.0", -+ "node_modules/conventional-changelog-core/node_modules/p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "restore-cursor": "^3.1.0" -+ "p-try": "^2.0.0" - }, - "engines": { -- "node": ">=8" -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/cli-width": { -- "version": "3.0.0", -+ "node_modules/conventional-changelog-core/node_modules/p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, -- "license": "ISC", -+ "dependencies": { -+ "p-limit": "^2.2.0" -+ }, - "engines": { -- "node": ">= 10" -+ "node": ">=8" - } - }, -- "node_modules/cliui": { -- "version": "6.0.0", -+ "node_modules/conventional-changelog-core/node_modules/parse-json": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "string-width": "^4.2.0", -- "strip-ansi": "^6.0.0", -- "wrap-ansi": "^6.2.0" -+ "@babel/code-frame": "^7.0.0", -+ "error-ex": "^1.3.1", -+ "json-parse-even-better-errors": "^2.3.0", -+ "lines-and-columns": "^1.1.6" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/cliui/node_modules/wrap-ansi": { -- "version": "6.2.0", -+ "node_modules/conventional-changelog-core/node_modules/path-exists": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, -- "license": "MIT", -- "dependencies": { -- "ansi-styles": "^4.0.0", -- "string-width": "^4.1.0", -- "strip-ansi": "^6.0.0" -- }, - "engines": { - "node": ">=8" - } - }, -- "node_modules/clone-deep": { -- "version": "4.0.1", -- "license": "MIT", -- "dependencies": { -- "is-plain-object": "^2.0.4", -- "kind-of": "^6.0.2", -- "shallow-clone": "^3.0.0" -+ "node_modules/conventional-changelog-core/node_modules/semver": { -+ "version": "7.6.3", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", -+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", -+ "dev": true, -+ "bin": { -+ "semver": "bin/semver.js" - }, - "engines": { -- "node": ">=6" -+ "node": ">=10" - } - }, -- "node_modules/clone-deep/node_modules/is-plain-object": { -- "version": "2.0.4", -- "license": "MIT", -+ "node_modules/conventional-changelog-core/node_modules/split2": { -+ "version": "3.2.2", -+ "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", -+ "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", -+ "dev": true, - "dependencies": { -- "isobject": "^3.0.1" -- }, -+ "readable-stream": "^3.0.0" -+ } -+ }, -+ "node_modules/conventional-changelog-core/node_modules/text-extensions": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", -+ "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", -+ "dev": true, - "engines": { -- "node": ">=0.10.0" -+ "node": ">=0.10" - } - }, -- "node_modules/clone-response": { -- "version": "1.0.3", -- "license": "MIT", -- "dependencies": { -- "mimic-response": "^1.0.0" -+ "node_modules/conventional-changelog-core/node_modules/type-fest": { -+ "version": "0.18.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", -+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", -+ "dev": true, -+ "engines": { -+ "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/color-convert": { -- "version": "2.0.1", -- "license": "MIT", -- "dependencies": { -- "color-name": "~1.1.4" -- }, -+ "node_modules/conventional-changelog-core/node_modules/yargs-parser": { -+ "version": "20.2.9", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", -+ "dev": true, - "engines": { -- "node": ">=7.0.0" -+ "node": ">=10" - } - }, -- "node_modules/color-name": { -- "version": "1.1.4", -- "license": "MIT" -- }, -- "node_modules/colord": { -- "version": "2.9.3", -+ "node_modules/conventional-changelog-ember": { -+ "version": "2.0.9", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz", -+ "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==", - "dev": true, -- "license": "MIT" -- }, -- "node_modules/colorette": { -- "version": "2.0.20", -- "license": "MIT" -+ "dependencies": { -+ "q": "^1.5.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ } - }, -- "node_modules/combined-stream": { -- "version": "1.0.8", -+ "node_modules/conventional-changelog-eslint": { -+ "version": "3.0.9", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz", -+ "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "delayed-stream": "~1.0.0" -+ "q": "^1.5.1" - }, - "engines": { -- "node": ">= 0.8" -+ "node": ">=10" - } - }, -- "node_modules/commander": { -- "version": "5.1.0", -+ "node_modules/conventional-changelog-express": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz", -+ "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==", - "dev": true, -- "license": "MIT", -+ "dependencies": { -+ "q": "^1.5.1" -+ }, - "engines": { -- "node": ">= 6" -+ "node": ">=10" - } - }, -- "node_modules/commondir": { -- "version": "1.0.1", -- "license": "MIT" -- }, -- "node_modules/compare-func": { -- "version": "2.0.0", -+ "node_modules/conventional-changelog-jquery": { -+ "version": "3.0.11", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz", -+ "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "array-ify": "^1.0.0", -- "dot-prop": "^5.1.0" -+ "q": "^1.5.1" -+ }, -+ "engines": { -+ "node": ">=10" - } - }, -- "node_modules/compare-func/node_modules/dot-prop": { -- "version": "5.3.0", -+ "node_modules/conventional-changelog-jshint": { -+ "version": "2.0.9", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz", -+ "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "is-obj": "^2.0.0" -+ "compare-func": "^2.0.0", -+ "q": "^1.5.1" - }, - "engines": { -- "node": ">=8" -+ "node": ">=10" - } - }, -- "node_modules/compare-version": { -- "version": "0.1.2", -+ "node_modules/conventional-changelog-preset-loader": { -+ "version": "2.3.4", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", -+ "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=0.10.0" -+ "node": ">=10" - } - }, -- "node_modules/compress-commons": { -- "version": "4.1.2", -+ "node_modules/conventional-changelog-writer": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz", -+ "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==", - "dev": true, -- "license": "MIT", -- "peer": true, - "dependencies": { -- "buffer-crc32": "^0.2.13", -- "crc32-stream": "^4.0.2", -- "normalize-path": "^3.0.0", -- "readable-stream": "^3.6.0" -+ "conventional-commits-filter": "^2.0.7", -+ "dateformat": "^3.0.0", -+ "handlebars": "^4.7.7", -+ "json-stringify-safe": "^5.0.1", -+ "lodash": "^4.17.15", -+ "meow": "^8.0.0", -+ "semver": "^6.0.0", -+ "split": "^1.0.0", -+ "through2": "^4.0.0" -+ }, -+ "bin": { -+ "conventional-changelog-writer": "cli.js" - }, - "engines": { -- "node": ">= 10" -+ "node": ">=10" - } - }, -- "node_modules/compressible": { -- "version": "2.0.18", -+ "node_modules/conventional-changelog-writer/node_modules/find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "mime-db": ">= 1.43.0 < 2" -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" - }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=8" - } - }, -- "node_modules/compression": { -- "version": "1.7.4", -+ "node_modules/conventional-changelog-writer/node_modules/locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "accepts": "~1.3.5", -- "bytes": "3.0.0", -- "compressible": "~2.0.16", -- "debug": "2.6.9", -- "on-headers": "~1.0.2", -- "safe-buffer": "5.1.2", -- "vary": "~1.1.2" -+ "p-locate": "^4.1.0" - }, - "engines": { -- "node": ">= 0.8.0" -+ "node": ">=8" - } - }, -- "node_modules/compression/node_modules/debug": { -- "version": "2.6.9", -+ "node_modules/conventional-changelog-writer/node_modules/meow": { ++ "node_modules/conventional-changelog-core/node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", "dev": true, -- "license": "MIT", - "dependencies": { -- "ms": "2.0.0" +- "license": "ISC", +- "engines": { +- "node": ">=10" +- } +- }, +- "node_modules/chrome-trace-event": { +- "version": "1.0.3", + "license": "MIT", ++ "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", @@ -9200,13 +8845,390 @@ index a38125e..a1067b0 100644 + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, -+ "engines": { + "engines": { +- "node": ">=6.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, +- "node_modules/chromium-pickle-js": { +- "version": "0.2.0", ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/hosted-git-info": { ++ "version": "2.8.9", ++ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", ++ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true, +- "license": "MIT" ++ "license": "ISC" + }, +- "node_modules/ci-info": { +- "version": "3.9.0", ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", ++ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, +- "funding": [ +- { +- "type": "github", +- "url": "https://github.com/sponsors/sibiraj-s" +- } +- ], +- "license": "MIT", +- "engines": { +- "node": ">=8" +- } +- }, +- "node_modules/clean-css": { +- "version": "5.3.2", + "license": "MIT", + "dependencies": { +- "source-map": "~0.6.0" ++ "@types/normalize-package-data": "^2.4.0", ++ "normalize-package-data": "^2.5.0", ++ "parse-json": "^5.0.0", ++ "type-fest": "^0.6.0" + }, + "engines": { +- "node": ">= 10.0" ++ "node": ">=8" + } + }, +- "node_modules/cli-cursor": { +- "version": "3.1.0", ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg-up": { ++ "version": "7.0.1", ++ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", ++ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "license": "MIT", + "dependencies": { +- "restore-cursor": "^3.1.0" ++ "find-up": "^4.1.0", ++ "read-pkg": "^5.2.0", ++ "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/cli-width": { +- "version": "3.0.0", ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { ++ "version": "0.8.1", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", ++ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, +- "license": "ISC", ++ "license": "(MIT OR CC0-1.0)", + "engines": { +- "node": ">= 10" ++ "node": ">=8" + } + }, +- "node_modules/cliui": { +- "version": "6.0.0", ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { ++ "version": "2.5.0", ++ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", ++ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, +- "license": "ISC", ++ "license": "BSD-2-Clause", + "dependencies": { +- "string-width": "^4.2.0", +- "strip-ansi": "^6.0.0", +- "wrap-ansi": "^6.2.0" ++ "hosted-git-info": "^2.1.4", ++ "resolve": "^1.10.0", ++ "semver": "2 || 3 || 4 || 5", ++ "validate-npm-package-license": "^3.0.1" + } + }, +- "node_modules/cliui/node_modules/wrap-ansi": { +- "version": "6.2.0", ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { ++ "version": "0.6.0", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", ++ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, +- "license": "MIT", +- "dependencies": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- }, ++ "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, +- "node_modules/clone-deep": { +- "version": "4.0.1", +- "license": "MIT", +- "dependencies": { +- "is-plain-object": "^2.0.4", +- "kind-of": "^6.0.2", +- "shallow-clone": "^3.0.0" +- }, +- "engines": { +- "node": ">=6" ++ "node_modules/conventional-changelog-core/node_modules/meow/node_modules/semver": { ++ "version": "5.7.2", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", ++ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", ++ "dev": true, ++ "license": "ISC", ++ "bin": { ++ "semver": "bin/semver" + } + }, +- "node_modules/clone-deep/node_modules/is-plain-object": { +- "version": "2.0.4", +- "license": "MIT", ++ "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { ++ "version": "3.0.3", ++ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", ++ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", ++ "dev": true, ++ "license": "BSD-2-Clause", + "dependencies": { +- "isobject": "^3.0.1" ++ "hosted-git-info": "^4.0.1", ++ "is-core-module": "^2.5.0", ++ "semver": "^7.3.4", ++ "validate-npm-package-license": "^3.0.1" + }, + "engines": { +- "node": ">=0.10.0" ++ "node": ">=10" + } + }, +- "node_modules/clone-response": { +- "version": "1.0.3", ++ "node_modules/conventional-changelog-core/node_modules/p-limit": { ++ "version": "2.3.0", ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", ++ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "mimic-response": "^1.0.0" ++ "p-try": "^2.0.0" ++ }, ++ "engines": { ++ "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/color-convert": { +- "version": "2.0.1", ++ "node_modules/conventional-changelog-core/node_modules/p-locate": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", ++ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", ++ "dev": true, + "license": "MIT", + "dependencies": { +- "color-name": "~1.1.4" ++ "p-limit": "^2.2.0" + }, + "engines": { +- "node": ">=7.0.0" ++ "node": ">=8" + } + }, +- "node_modules/color-name": { +- "version": "1.1.4", +- "license": "MIT" +- }, +- "node_modules/colord": { +- "version": "2.9.3", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/colorette": { +- "version": "2.0.20", +- "license": "MIT" +- }, +- "node_modules/combined-stream": { +- "version": "1.0.8", ++ "node_modules/conventional-changelog-core/node_modules/parse-json": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", ++ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "dependencies": { +- "delayed-stream": "~1.0.0" ++ "@babel/code-frame": "^7.0.0", ++ "error-ex": "^1.3.1", ++ "json-parse-even-better-errors": "^2.3.0", ++ "lines-and-columns": "^1.1.6" + }, + "engines": { +- "node": ">= 0.8" ++ "node": ">=8" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/commander": { +- "version": "5.1.0", ++ "node_modules/conventional-changelog-core/node_modules/path-exists": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", ++ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { +- "node": ">= 6" ++ "node": ">=8" + } + }, +- "node_modules/commondir": { +- "version": "1.0.1", +- "license": "MIT" +- }, +- "node_modules/compare-func": { +- "version": "2.0.0", ++ "node_modules/conventional-changelog-core/node_modules/semver": { ++ "version": "7.6.3", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", ++ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, +- "license": "MIT", +- "dependencies": { +- "array-ify": "^1.0.0", +- "dot-prop": "^5.1.0" ++ "license": "ISC", ++ "bin": { ++ "semver": "bin/semver.js" ++ }, ++ "engines": { ++ "node": ">=10" + } + }, +- "node_modules/compare-func/node_modules/dot-prop": { +- "version": "5.3.0", ++ "node_modules/conventional-changelog-core/node_modules/split2": { ++ "version": "3.2.2", ++ "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", ++ "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "dev": true, +- "license": "MIT", ++ "license": "ISC", + "dependencies": { +- "is-obj": "^2.0.0" +- }, +- "engines": { +- "node": ">=8" ++ "readable-stream": "^3.0.0" + } + }, +- "node_modules/compare-version": { +- "version": "0.1.2", ++ "node_modules/conventional-changelog-core/node_modules/text-extensions": { ++ "version": "1.9.0", ++ "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", ++ "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", + "dev": true, + "license": "MIT", + "engines": { +- "node": ">=0.10.0" ++ "node": ">=0.10" + } + }, +- "node_modules/compress-commons": { +- "version": "4.1.2", ++ "node_modules/conventional-changelog-core/node_modules/type-fest": { ++ "version": "0.18.1", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", ++ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, +- "license": "MIT", +- "peer": true, +- "dependencies": { +- "buffer-crc32": "^0.2.13", +- "crc32-stream": "^4.0.2", +- "normalize-path": "^3.0.0", +- "readable-stream": "^3.6.0" +- }, ++ "license": "(MIT OR CC0-1.0)", + "engines": { +- "node": ">= 10" ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/compressible": { +- "version": "2.0.18", ++ "node_modules/conventional-changelog-core/node_modules/yargs-parser": { ++ "version": "20.2.9", ++ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", ++ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, +- "license": "MIT", +- "dependencies": { +- "mime-db": ">= 1.43.0 < 2" +- }, ++ "license": "ISC", + "engines": { +- "node": ">= 0.6" ++ "node": ">=10" + } + }, +- "node_modules/compression": { +- "version": "1.7.4", ++ "node_modules/conventional-changelog-ember": { ++ "version": "2.0.9", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz", ++ "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==", + "dev": true, +- "license": "MIT", ++ "license": "ISC", + "dependencies": { +- "accepts": "~1.3.5", +- "bytes": "3.0.0", +- "compressible": "~2.0.16", +- "debug": "2.6.9", +- "on-headers": "~1.0.2", +- "safe-buffer": "5.1.2", +- "vary": "~1.1.2" ++ "q": "^1.5.1" + }, + "engines": { +- "node": ">= 0.8.0" ++ "node": ">=10" + } + }, +- "node_modules/compression/node_modules/debug": { +- "version": "2.6.9", ++ "node_modules/conventional-changelog-eslint": { ++ "version": "3.0.9", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz", ++ "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==", + "dev": true, +- "license": "MIT", ++ "license": "ISC", + "dependencies": { +- "ms": "2.0.0" ++ "q": "^1.5.1" ++ }, ++ "engines": { ++ "node": ">=10" + } + }, - "node_modules/compression/node_modules/ms": { - "version": "2.0.0", - "dev": true, @@ -9223,33 +9245,27 @@ index a38125e..a1067b0 100644 - }, - "node_modules/concat-stream": { - "version": "2.0.0", -+ "node_modules/conventional-changelog-writer/node_modules/normalize-package-data": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", -+ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", ++ "node_modules/conventional-changelog-express": { ++ "version": "2.0.6", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz", ++ "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==", "dev": true, - "engines": [ - "node >= 6.0" - ], - "license": "MIT", - "dependencies": { +- "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" -+ "hosted-git-info": "^4.0.1", -+ "is-core-module": "^2.5.0", -+ "semver": "^7.3.4", -+ "validate-npm-package-license": "^3.0.1" -+ }, -+ "engines": { -+ "node": ">=10" - } - }, +- } +- }, - "node_modules/conf": { - "version": "10.2.0", - "license": "MIT", -- "dependencies": { ++ "license": "ISC", + "dependencies": { - "ajv": "^8.6.3", - "ajv-formats": "^2.1.1", - "atomically": "^1.7.0", @@ -9260,13 +9276,7 @@ index a38125e..a1067b0 100644 - "onetime": "^5.1.2", - "pkg-up": "^3.1.0", - "semver": "^7.3.5" -+ "node_modules/conventional-changelog-writer/node_modules/normalize-package-data/node_modules/semver": { -+ "version": "7.6.3", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", -+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", -+ "dev": true, -+ "bin": { -+ "semver": "bin/semver.js" ++ "q": "^1.5.1" }, "engines": { - "node": ">=12" @@ -9279,25 +9289,24 @@ index a38125e..a1067b0 100644 - "node_modules/conf/node_modules/ajv": { - "version": "8.12.0", - "license": "MIT", -+ "node_modules/conventional-changelog-writer/node_modules/p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", ++ "node_modules/conventional-changelog-jquery": { ++ "version": "3.0.11", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz", ++ "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==", + "dev": true, ++ "license": "ISC", "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" -+ "p-try": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6" ++ "q": "^1.5.1" }, - "funding": { +- "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" -+ "url": "https://github.com/sponsors/sindresorhus" ++ "engines": { ++ "node": ">=10" } }, - "node_modules/conf/node_modules/json-schema-traverse": { @@ -9306,73 +9315,91 @@ index a38125e..a1067b0 100644 - }, - "node_modules/conf/node_modules/lru-cache": { - "version": "6.0.0", -- "license": "ISC", -+ "node_modules/conventional-changelog-writer/node_modules/p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", ++ "node_modules/conventional-changelog-jshint": { ++ "version": "2.0.9", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz", ++ "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==", + "dev": true, + "license": "ISC", "dependencies": { - "yallist": "^4.0.0" -+ "p-limit": "^2.2.0" ++ "compare-func": "^2.0.0", ++ "q": "^1.5.1" }, "engines": { -- "node": ">=10" -+ "node": ">=8" + "node": ">=10" } }, - "node_modules/conf/node_modules/semver": { - "version": "7.5.4", - "license": "ISC", -+ "node_modules/conventional-changelog-writer/node_modules/parse-json": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", ++ "node_modules/conventional-changelog-preset-loader": { ++ "version": "2.3.4", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", ++ "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", + "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=10" ++ } ++ }, ++ "node_modules/conventional-changelog-writer": { ++ "version": "5.0.1", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz", ++ "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==", ++ "dev": true, ++ "license": "MIT", "dependencies": { - "lru-cache": "^6.0.0" -- }, -- "bin": { ++ "conventional-commits-filter": "^2.0.7", ++ "dateformat": "^3.0.0", ++ "handlebars": "^4.7.7", ++ "json-stringify-safe": "^5.0.1", ++ "lodash": "^4.17.15", ++ "meow": "^8.0.0", ++ "semver": "^6.0.0", ++ "split": "^1.0.0", ++ "through2": "^4.0.0" + }, + "bin": { - "semver": "bin/semver.js" -+ "@babel/code-frame": "^7.0.0", -+ "error-ex": "^1.3.1", -+ "json-parse-even-better-errors": "^2.3.0", -+ "lines-and-columns": "^1.1.6" ++ "conventional-changelog-writer": "cli.js" }, "engines": { -- "node": ">=10" -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" + "node": ">=10" } }, - "node_modules/conf/node_modules/yallist": { -+ "node_modules/conventional-changelog-writer/node_modules/path-exists": { - "version": "4.0.0", +- "version": "4.0.0", - "license": "ISC" - }, - "node_modules/config-file-ts": { - "version": "0.2.6", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", ++ "node_modules/conventional-changelog-writer/node_modules/find-up": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", ++ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, -- "license": "MIT", -- "dependencies": { + "license": "MIT", + "dependencies": { - "glob": "^10.3.10", - "typescript": "^5.3.3" ++ "locate-path": "^5.0.0", ++ "path-exists": "^4.0.0" ++ }, + "engines": { + "node": ">=8" } }, - "node_modules/config-file-ts/node_modules/glob": { - "version": "10.3.15", -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", -+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", ++ "node_modules/conventional-changelog-writer/node_modules/locate-path": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", ++ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, - "license": "ISC", ++ "license": "MIT", "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", @@ -9382,10 +9409,7 @@ index a38125e..a1067b0 100644 - }, - "bin": { - "glob": "dist/esm/bin.mjs" -+ "@types/normalize-package-data": "^2.4.0", -+ "normalize-package-data": "^2.5.0", -+ "parse-json": "^5.0.0", -+ "type-fest": "^0.6.0" ++ "p-locate": "^4.1.0" }, "engines": { - "node": ">=16 || 14 >=14.18" @@ -9397,344 +9421,15 @@ index a38125e..a1067b0 100644 }, - "node_modules/config-file-ts/node_modules/minimatch": { - "version": "9.0.4", -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg-up": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", -+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "brace-expansion": "^2.0.1" -+ "find-up": "^4.1.0", -+ "read-pkg": "^5.2.0", -+ "type-fest": "^0.8.1" - }, - "engines": { -- "node": ">=16 || 14 >=14.17" -+ "node": ">=8" - }, - "funding": { -- "url": "https://github.com/sponsors/isaacs" -+ "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/config-file-ts/node_modules/minipass": { -- "version": "7.1.1", -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg-up/node_modules/type-fest": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", -+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, -- "license": "ISC", - "engines": { -- "node": ">=16 || 14 >=14.17" -+ "node": ">=8" - } - }, -- "node_modules/config-file-ts/node_modules/typescript": { -- "version": "5.4.5", -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", -+ "dev": true -+ }, -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "dev": true, -+ "dependencies": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/semver": { -+ "version": "5.7.2", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", -+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, -- "license": "Apache-2.0", - "bin": { -- "tsc": "bin/tsc", -- "tsserver": "bin/tsserver" -- }, -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/type-fest": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", -+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", -+ "dev": true, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/conventional-changelog-writer/node_modules/type-fest": { -+ "version": "0.18.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", -+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", -+ "dev": true, - "engines": { -- "node": ">=14.17" -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/connect-history-api-fallback": { -- "version": "2.0.0", -+ "node_modules/conventional-changelog-writer/node_modules/yargs-parser": { -+ "version": "20.2.9", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=0.8" -+ "node": ">=10" - } - }, -- "node_modules/content-disposition": { -- "version": "0.5.4", -+ "node_modules/conventional-changelog/node_modules/conventional-changelog-angular": { -+ "version": "5.0.13", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz", -+ "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "safe-buffer": "5.2.1" -+ "compare-func": "^2.0.0", -+ "q": "^1.5.1" - }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=10" - } - }, -- "node_modules/content-type": { -- "version": "1.0.5", -+ "node_modules/conventional-changelog/node_modules/conventional-changelog-conventionalcommits": { -+ "version": "4.6.3", -+ "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", -+ "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", - "dev": true, -- "license": "MIT", -+ "dependencies": { -+ "compare-func": "^2.0.0", -+ "lodash": "^4.17.15", -+ "q": "^1.5.1" -+ }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=10" - } - }, -- "node_modules/conventional-changelog": { -- "version": "3.1.24", -+ "node_modules/conventional-commits-filter": { -+ "version": "2.0.7", -+ "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", -+ "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "conventional-changelog-angular": "^5.0.12", -- "conventional-changelog-atom": "^2.0.8", -- "conventional-changelog-codemirror": "^2.0.8", -- "conventional-changelog-conventionalcommits": "^4.5.0", -- "conventional-changelog-core": "^4.2.1", -- "conventional-changelog-ember": "^2.0.9", -- "conventional-changelog-eslint": "^3.0.9", -- "conventional-changelog-express": "^2.0.6", -- "conventional-changelog-jquery": "^3.0.11", -- "conventional-changelog-jshint": "^2.0.9", -- "conventional-changelog-preset-loader": "^2.3.4" -+ "lodash.ismatch": "^4.4.0", -+ "modify-values": "^1.0.0" - }, - "engines": { - "node": ">=10" - } - }, -- "node_modules/conventional-changelog-angular": { -- "version": "5.0.13", -+ "node_modules/conventional-commits-parser": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz", -+ "integrity": "sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "compare-func": "^2.0.0", -- "q": "^1.5.1" -+ "is-text-path": "^2.0.0", -+ "JSONStream": "^1.3.5", -+ "meow": "^12.0.1", -+ "split2": "^4.0.0" -+ }, -+ "bin": { -+ "conventional-commits-parser": "cli.mjs" - }, - "engines": { -- "node": ">=10" -+ "node": ">=16" - } - }, -- "node_modules/conventional-changelog-atom": { -- "version": "2.0.8", -+ "node_modules/conventional-recommended-bump": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz", -+ "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==", - "dev": true, -- "license": "ISC", - "dependencies": { -+ "concat-stream": "^2.0.0", -+ "conventional-changelog-preset-loader": "^2.3.4", -+ "conventional-commits-filter": "^2.0.7", -+ "conventional-commits-parser": "^3.2.0", -+ "git-raw-commits": "^2.0.8", -+ "git-semver-tags": "^4.1.1", -+ "meow": "^8.0.0", - "q": "^1.5.1" - }, -+ "bin": { -+ "conventional-recommended-bump": "cli.js" -+ }, - "engines": { - "node": ">=10" - } - }, -- "node_modules/conventional-changelog-codemirror": { -- "version": "2.0.8", -+ "node_modules/conventional-recommended-bump/node_modules/conventional-commits-parser": { -+ "version": "3.2.4", -+ "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", -+ "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "q": "^1.5.1" -+ "is-text-path": "^1.0.1", -+ "JSONStream": "^1.0.4", -+ "lodash": "^4.17.15", -+ "meow": "^8.0.0", -+ "split2": "^3.0.0", -+ "through2": "^4.0.0" -+ }, -+ "bin": { -+ "conventional-commits-parser": "cli.js" - }, - "engines": { - "node": ">=10" - } - }, -- "node_modules/conventional-changelog-config-spec": { -- "version": "2.1.0", -+ "node_modules/conventional-recommended-bump/node_modules/dargs": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", -+ "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", - "dev": true, -- "license": "MIT" -+ "engines": { -+ "node": ">=8" -+ } - }, -- "node_modules/conventional-changelog-conventionalcommits": { -- "version": "4.6.1", -+ "node_modules/conventional-recommended-bump/node_modules/find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "compare-func": "^2.0.0", -- "lodash": "^4.17.15", -- "q": "^1.5.1" -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" - }, - "engines": { -- "node": ">=10" -+ "node": ">=8" - } - }, -- "node_modules/conventional-changelog-core": { -- "version": "4.2.4", -+ "node_modules/conventional-recommended-bump/node_modules/git-raw-commits": { -+ "version": "2.0.11", -+ "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", -+ "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "add-stream": "^1.0.0", -- "conventional-changelog-writer": "^5.0.0", -- "conventional-commits-parser": "^3.2.0", -- "dateformat": "^3.0.0", -- "get-pkg-repo": "^4.0.0", -- "git-raw-commits": "^2.0.8", -- "git-remote-origin-url": "^2.0.0", -- "git-semver-tags": "^4.1.1", -+ "dargs": "^7.0.0", - "lodash": "^4.17.15", -- "normalize-package-data": "^3.0.0", -- "q": "^1.5.1", -- "read-pkg": "^3.0.0", -- "read-pkg-up": "^3.0.0", -+ "meow": "^8.0.0", -+ "split2": "^3.0.0", - "through2": "^4.0.0" - }, -+ "bin": { -+ "git-raw-commits": "cli.js" -+ }, - "engines": { - "node": ">=10" - } - }, -- "node_modules/conventional-changelog-core/node_modules/lru-cache": { -- "version": "6.0.0", -+ "node_modules/conventional-recommended-bump/node_modules/is-text-path": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", -+ "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", - "dev": true, -- "license": "ISC", - "dependencies": { -- "yallist": "^4.0.0" -+ "text-extensions": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/conventional-recommended-bump/node_modules/locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -+ "dev": true, -+ "dependencies": { -+ "p-locate": "^4.1.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/conventional-recommended-bump/node_modules/meow": { ++ "node_modules/conventional-changelog-writer/node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", -+ "dev": true, -+ "dependencies": { + "dev": true, +- "license": "ISC", ++ "license": "MIT", + "dependencies": { +- "brace-expansion": "^2.0.1" + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", @@ -9748,103 +9443,142 @@ index a38125e..a1067b0 100644 + "yargs-parser": "^20.2.3" }, "engines": { - "node": ">=10" -+ }, -+ "funding": { +- "node": ">=16 || 14 >=14.17" ++ "node": ">=10" + }, + "funding": { +- "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { -+ "node_modules/conventional-recommended-bump/node_modules/normalize-package-data": { - "version": "3.0.3", +- "node_modules/config-file-ts/node_modules/minipass": { +- "version": "7.1.1", ++ "node_modules/conventional-changelog-writer/node_modules/normalize-package-data": { ++ "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", "dev": true, -- "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", -@@ -6126,195 +6930,216 @@ - "node": ">=10" +- "license": "ISC", ++ "license": "BSD-2-Clause", ++ "dependencies": { ++ "hosted-git-info": "^4.0.1", ++ "is-core-module": "^2.5.0", ++ "semver": "^7.3.4", ++ "validate-npm-package-license": "^3.0.1" ++ }, + "engines": { +- "node": ">=16 || 14 >=14.17" ++ "node": ">=10" } }, -- "node_modules/conventional-changelog-core/node_modules/semver": { -- "version": "7.5.4", -+ "node_modules/conventional-recommended-bump/node_modules/p-limit": { +- "node_modules/config-file-ts/node_modules/typescript": { +- "version": "5.4.5", ++ "node_modules/conventional-changelog-writer/node_modules/normalize-package-data/node_modules/semver": { ++ "version": "7.6.3", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", ++ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, +- "license": "Apache-2.0", ++ "license": "ISC", + "bin": { +- "tsc": "bin/tsc", +- "tsserver": "bin/tsserver" ++ "semver": "bin/semver.js" + }, + "engines": { +- "node": ">=14.17" ++ "node": ">=10" + } + }, +- "node_modules/connect-history-api-fallback": { +- "version": "2.0.0", ++ "node_modules/conventional-changelog-writer/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, -- "license": "ISC", - "dependencies": { -- "lru-cache": "^6.0.0" -- }, -- "bin": { -- "semver": "bin/semver.js" + "license": "MIT", ++ "dependencies": { + "p-try": "^2.0.0" - }, ++ }, "engines": { -- "node": ">=10" +- "node": ">=0.8" + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/conventional-changelog-core/node_modules/yallist": { -- "version": "4.0.0", -- "dev": true, -- "license": "ISC" -- }, -- "node_modules/conventional-changelog-ember": { -- "version": "2.0.9", -+ "node_modules/conventional-recommended-bump/node_modules/p-locate": { +- "node_modules/content-disposition": { +- "version": "0.5.4", ++ "node_modules/conventional-changelog-writer/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, -- "license": "ISC", + "license": "MIT", "dependencies": { -- "q": "^1.5.1" +- "safe-buffer": "5.2.1" + "p-limit": "^2.2.0" }, "engines": { -- "node": ">=10" +- "node": ">= 0.6" + "node": ">=8" } }, -- "node_modules/conventional-changelog-eslint": { -- "version": "3.0.9", -+ "node_modules/conventional-recommended-bump/node_modules/parse-json": { +- "node_modules/content-type": { +- "version": "1.0.5", ++ "node_modules/conventional-changelog-writer/node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, -- "license": "ISC", - "dependencies": { -- "q": "^1.5.1" + "license": "MIT", ++ "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" - }, ++ }, "engines": { -- "node": ">=10" +- "node": ">= 0.6" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/conventional-changelog-express": { -- "version": "2.0.6", -+ "node_modules/conventional-recommended-bump/node_modules/path-exists": { +- "node_modules/conventional-changelog": { +- "version": "3.1.24", ++ "node_modules/conventional-changelog-writer/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", +- "dependencies": { +- "conventional-changelog-angular": "^5.0.12", +- "conventional-changelog-atom": "^2.0.8", +- "conventional-changelog-codemirror": "^2.0.8", +- "conventional-changelog-conventionalcommits": "^4.5.0", +- "conventional-changelog-core": "^4.2.1", +- "conventional-changelog-ember": "^2.0.9", +- "conventional-changelog-eslint": "^3.0.9", +- "conventional-changelog-express": "^2.0.6", +- "conventional-changelog-jquery": "^3.0.11", +- "conventional-changelog-jshint": "^2.0.9", +- "conventional-changelog-preset-loader": "^2.3.4" +- }, +- "engines": { +- "node": ">=10" +- } +- }, +- "node_modules/conventional-changelog-angular": { +- "version": "5.0.13", +- "dev": true, - "license": "ISC", - "dependencies": { +- "compare-func": "^2.0.0", - "q": "^1.5.1" - }, "engines": { @@ -9852,14 +9586,15 @@ index a38125e..a1067b0 100644 + "node": ">=8" } }, -- "node_modules/conventional-changelog-jquery": { -- "version": "3.0.11", -+ "node_modules/conventional-recommended-bump/node_modules/read-pkg": { +- "node_modules/conventional-changelog-atom": { +- "version": "2.0.8", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, - "license": "ISC", ++ "license": "MIT", "dependencies": { - "q": "^1.5.1" + "@types/normalize-package-data": "^2.4.0", @@ -9872,16 +9607,16 @@ index a38125e..a1067b0 100644 + "node": ">=8" } }, -- "node_modules/conventional-changelog-jshint": { -- "version": "2.0.9", -+ "node_modules/conventional-recommended-bump/node_modules/read-pkg-up": { +- "node_modules/conventional-changelog-codemirror": { +- "version": "2.0.8", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, - "license": "ISC", ++ "license": "MIT", "dependencies": { -- "compare-func": "^2.0.0", - "q": "^1.5.1" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", @@ -9889,39 +9624,228 @@ index a38125e..a1067b0 100644 }, "engines": { - "node": ">=10" +- } +- }, +- "node_modules/conventional-changelog-config-spec": { +- "version": "2.1.0", +- "dev": true, +- "license": "MIT" +- }, +- "node_modules/conventional-changelog-conventionalcommits": { +- "version": "4.6.1", +- "dev": true, +- "license": "ISC", +- "dependencies": { +- "compare-func": "^2.0.0", +- "lodash": "^4.17.15", +- "q": "^1.5.1" + "node": ">=8" -+ }, + }, +- "engines": { +- "node": ">=10" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, -- "node_modules/conventional-changelog-preset-loader": { -- "version": "2.3.4", -+ "node_modules/conventional-recommended-bump/node_modules/read-pkg-up/node_modules/type-fest": { +- "node_modules/conventional-changelog-core": { +- "version": "4.2.4", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true, - "license": "MIT", +- "dependencies": { +- "add-stream": "^1.0.0", +- "conventional-changelog-writer": "^5.0.0", +- "conventional-commits-parser": "^3.2.0", +- "dateformat": "^3.0.0", +- "get-pkg-repo": "^4.0.0", +- "git-raw-commits": "^2.0.8", +- "git-remote-origin-url": "^2.0.0", +- "git-semver-tags": "^4.1.1", +- "lodash": "^4.17.15", +- "normalize-package-data": "^3.0.0", +- "q": "^1.5.1", +- "read-pkg": "^3.0.0", +- "read-pkg-up": "^3.0.0", +- "through2": "^4.0.0" +- }, ++ "license": "(MIT OR CC0-1.0)", "engines": { - "node": ">=10" + "node": ">=8" } }, -- "node_modules/conventional-changelog-writer": { -- "version": "5.0.1", -+ "node_modules/conventional-recommended-bump/node_modules/read-pkg/node_modules/hosted-git-info": { +- "node_modules/conventional-changelog-core/node_modules/lru-cache": { +- "version": "6.0.0", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", -+ "dev": true -+ }, -+ "node_modules/conventional-recommended-bump/node_modules/read-pkg/node_modules/normalize-package-data": { + "dev": true, +- "license": "ISC", +- "dependencies": { +- "yallist": "^4.0.0" +- }, +- "engines": { +- "node": ">=10" +- } ++ "license": "ISC" + }, +- "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { +- "version": "3.0.3", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, -- "license": "MIT", + "license": "BSD-2-Clause", + "dependencies": { +- "hosted-git-info": "^4.0.1", +- "is-core-module": "^2.5.0", +- "semver": "^7.3.4", ++ "hosted-git-info": "^2.1.4", ++ "resolve": "^1.10.0", ++ "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" +- }, +- "engines": { +- "node": ">=10" + } + }, +- "node_modules/conventional-changelog-core/node_modules/semver": { +- "version": "7.5.4", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/semver": { ++ "version": "5.7.2", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", ++ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, + "bin": { +- "semver": "bin/semver.js" +- }, +- "engines": { +- "node": ">=10" ++ "semver": "bin/semver" + } + }, +- "node_modules/conventional-changelog-core/node_modules/yallist": { +- "version": "4.0.0", +- "dev": true, +- "license": "ISC" +- }, +- "node_modules/conventional-changelog-ember": { +- "version": "2.0.9", ++ "node_modules/conventional-changelog-writer/node_modules/read-pkg/node_modules/type-fest": { ++ "version": "0.6.0", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", ++ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, +- "license": "ISC", +- "dependencies": { +- "q": "^1.5.1" +- }, ++ "license": "(MIT OR CC0-1.0)", + "engines": { +- "node": ">=10" ++ "node": ">=8" + } + }, +- "node_modules/conventional-changelog-eslint": { +- "version": "3.0.9", ++ "node_modules/conventional-changelog-writer/node_modules/type-fest": { ++ "version": "0.18.1", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", ++ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, +- "license": "ISC", +- "dependencies": { +- "q": "^1.5.1" +- }, ++ "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/conventional-changelog-express": { +- "version": "2.0.6", ++ "node_modules/conventional-changelog-writer/node_modules/yargs-parser": { ++ "version": "20.2.9", ++ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", ++ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", +- "dependencies": { +- "q": "^1.5.1" +- }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/conventional-changelog-jquery": { +- "version": "3.0.11", ++ "node_modules/conventional-changelog/node_modules/conventional-changelog-angular": { ++ "version": "5.0.13", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz", ++ "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==", + "dev": true, + "license": "ISC", + "dependencies": { ++ "compare-func": "^2.0.0", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/conventional-changelog-jshint": { +- "version": "2.0.9", ++ "node_modules/conventional-changelog/node_modules/conventional-changelog-conventionalcommits": { ++ "version": "4.6.3", ++ "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", ++ "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", + "dev": true, + "license": "ISC", + "dependencies": { + "compare-func": "^2.0.0", ++ "lodash": "^4.17.15", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/conventional-changelog-preset-loader": { +- "version": "2.3.4", ++ "node_modules/conventional-commits-filter": { ++ "version": "2.0.7", ++ "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", ++ "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", + "dev": true, + "license": "MIT", ++ "dependencies": { ++ "lodash.ismatch": "^4.4.0", ++ "modify-values": "^1.0.0" ++ }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/conventional-changelog-writer": { +- "version": "5.0.1", ++ "node_modules/conventional-commits-parser": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz", ++ "integrity": "sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==", + "dev": true, + "license": "MIT", "dependencies": { - "conventional-commits-filter": "^2.0.7", - "dateformat": "^3.0.0", @@ -9932,7 +9856,311 @@ index a38125e..a1067b0 100644 - "semver": "^6.0.0", - "split": "^1.0.0", - "through2": "^4.0.0" -- }, ++ "is-text-path": "^2.0.0", ++ "JSONStream": "^1.3.5", ++ "meow": "^12.0.1", ++ "split2": "^4.0.0" + }, + "bin": { +- "conventional-changelog-writer": "cli.js" ++ "conventional-commits-parser": "cli.mjs" + }, + "engines": { +- "node": ">=10" ++ "node": ">=16" + } + }, +- "node_modules/conventional-commits-filter": { +- "version": "2.0.7", ++ "node_modules/conventional-recommended-bump": { ++ "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz", ++ "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==", + "dev": true, + "license": "MIT", + "dependencies": { +- "lodash.ismatch": "^4.4.0", +- "modify-values": "^1.0.0" ++ "concat-stream": "^2.0.0", ++ "conventional-changelog-preset-loader": "^2.3.4", ++ "conventional-commits-filter": "^2.0.7", ++ "conventional-commits-parser": "^3.2.0", ++ "git-raw-commits": "^2.0.8", ++ "git-semver-tags": "^4.1.1", ++ "meow": "^8.0.0", ++ "q": "^1.5.1" ++ }, ++ "bin": { ++ "conventional-recommended-bump": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/conventional-commits-parser": { ++ "node_modules/conventional-recommended-bump/node_modules/conventional-commits-parser": { + "version": "3.2.4", ++ "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", ++ "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6262,59 +7388,348 @@ + "node": ">=10" + } + }, +- "node_modules/conventional-commits-parser/node_modules/split2": { +- "version": "3.2.2", ++ "node_modules/conventional-recommended-bump/node_modules/dargs": { ++ "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", ++ "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", + "dev": true, +- "license": "ISC", ++ "license": "MIT", ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/find-up": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", ++ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", ++ "dev": true, ++ "license": "MIT", + "dependencies": { +- "readable-stream": "^3.0.0" ++ "locate-path": "^5.0.0", ++ "path-exists": "^4.0.0" ++ }, ++ "engines": { ++ "node": ">=8" + } + }, +- "node_modules/conventional-recommended-bump": { +- "version": "6.1.0", ++ "node_modules/conventional-recommended-bump/node_modules/git-raw-commits": { ++ "version": "2.0.11", ++ "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", ++ "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==", + "dev": true, + "license": "MIT", + "dependencies": { +- "concat-stream": "^2.0.0", +- "conventional-changelog-preset-loader": "^2.3.4", +- "conventional-commits-filter": "^2.0.7", +- "conventional-commits-parser": "^3.2.0", +- "git-raw-commits": "^2.0.8", +- "git-semver-tags": "^4.1.1", ++ "dargs": "^7.0.0", ++ "lodash": "^4.17.15", + "meow": "^8.0.0", +- "q": "^1.5.1" ++ "split2": "^3.0.0", ++ "through2": "^4.0.0" + }, + "bin": { +- "conventional-recommended-bump": "cli.js" ++ "git-raw-commits": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/convert-source-map": { +- "version": "2.0.0", +- "license": "MIT", +- "peer": true +- }, +- "node_modules/cookie": { +- "version": "0.6.0", ++ "node_modules/conventional-recommended-bump/node_modules/is-text-path": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", ++ "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", + "dev": true, + "license": "MIT", ++ "dependencies": { ++ "text-extensions": "^1.0.0" ++ }, + "engines": { +- "node": ">= 0.6" ++ "node": ">=0.10.0" + } + }, +- "node_modules/cookie-signature": { +- "version": "1.0.6", ++ "node_modules/conventional-recommended-bump/node_modules/locate-path": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", ++ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "p-locate": "^4.1.0" ++ }, ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/meow": { ++ "version": "8.1.2", ++ "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", ++ "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@types/minimist": "^1.2.0", ++ "camelcase-keys": "^6.2.2", ++ "decamelize-keys": "^1.1.0", ++ "hard-rejection": "^2.1.0", ++ "minimist-options": "4.1.0", ++ "normalize-package-data": "^3.0.0", ++ "read-pkg-up": "^7.0.1", ++ "redent": "^3.0.0", ++ "trim-newlines": "^3.0.0", ++ "type-fest": "^0.18.0", ++ "yargs-parser": "^20.2.3" ++ }, ++ "engines": { ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/normalize-package-data": { ++ "version": "3.0.3", ++ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", ++ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", ++ "dev": true, ++ "license": "BSD-2-Clause", ++ "dependencies": { ++ "hosted-git-info": "^4.0.1", ++ "is-core-module": "^2.5.0", ++ "semver": "^7.3.4", ++ "validate-npm-package-license": "^3.0.1" ++ }, ++ "engines": { ++ "node": ">=10" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/p-limit": { ++ "version": "2.3.0", ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", ++ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "p-try": "^2.0.0" ++ }, ++ "engines": { ++ "node": ">=6" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/p-locate": { ++ "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", ++ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "p-limit": "^2.2.0" ++ }, ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/parse-json": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", ++ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@babel/code-frame": "^7.0.0", ++ "error-ex": "^1.3.1", ++ "json-parse-even-better-errors": "^2.3.0", ++ "lines-and-columns": "^1.1.6" ++ }, ++ "engines": { ++ "node": ">=8" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/path-exists": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", ++ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/read-pkg": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", ++ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@types/normalize-package-data": "^2.4.0", ++ "normalize-package-data": "^2.5.0", ++ "parse-json": "^5.0.0", ++ "type-fest": "^0.6.0" ++ }, ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/read-pkg-up": { ++ "version": "7.0.1", ++ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", ++ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "find-up": "^4.1.0", ++ "read-pkg": "^5.2.0", ++ "type-fest": "^0.8.1" ++ }, ++ "engines": { ++ "node": ">=8" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/read-pkg-up/node_modules/type-fest": { ++ "version": "0.8.1", ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", ++ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", ++ "dev": true, ++ "license": "(MIT OR CC0-1.0)", ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/read-pkg/node_modules/hosted-git-info": { ++ "version": "2.8.9", ++ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", ++ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", ++ "dev": true, ++ "license": "ISC" ++ }, ++ "node_modules/conventional-recommended-bump/node_modules/read-pkg/node_modules/normalize-package-data": { ++ "version": "2.5.0", ++ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", ++ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", ++ "dev": true, ++ "license": "BSD-2-Clause", ++ "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", @@ -9944,86 +10172,50 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, - "bin": { -- "conventional-changelog-writer": "cli.js" -- }, -- "engines": { -- "node": ">=10" ++ "license": "ISC", ++ "bin": { + "semver": "bin/semver" - } - }, -- "node_modules/conventional-commits-filter": { -- "version": "2.0.7", ++ } ++ }, + "node_modules/conventional-recommended-bump/node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, -- "license": "MIT", -- "dependencies": { -- "lodash.ismatch": "^4.4.0", -- "modify-values": "^1.0.0" -- }, - "engines": { -- "node": ">=10" ++ "dev": true, ++ "license": "(MIT OR CC0-1.0)", ++ "engines": { + "node": ">=8" - } - }, -- "node_modules/conventional-commits-parser": { -- "version": "3.2.4", ++ } ++ }, + "node_modules/conventional-recommended-bump/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "dev": true, -- "license": "MIT", -- "dependencies": { -- "is-text-path": "^1.0.1", -- "JSONStream": "^1.0.4", -- "lodash": "^4.17.15", -- "meow": "^8.0.0", -- "split2": "^3.0.0", -- "through2": "^4.0.0" -- }, - "bin": { -- "conventional-commits-parser": "cli.js" ++ "dev": true, ++ "license": "ISC", ++ "bin": { + "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, -- "node_modules/conventional-commits-parser/node_modules/split2": { ++ }, ++ "engines": { ++ "node": ">=10" ++ } ++ }, + "node_modules/conventional-recommended-bump/node_modules/split2": { - "version": "3.2.2", ++ "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", - "dev": true, -- "license": "ISC", - "dependencies": { - "readable-stream": "^3.0.0" - } - }, -- "node_modules/conventional-recommended-bump": { -- "version": "6.1.0", ++ "dev": true, ++ "license": "ISC", ++ "dependencies": { ++ "readable-stream": "^3.0.0" ++ } ++ }, + "node_modules/conventional-recommended-bump/node_modules/text-extensions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", + "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", - "dev": true, -- "license": "MIT", -- "dependencies": { -- "concat-stream": "^2.0.0", -- "conventional-changelog-preset-loader": "^2.3.4", -- "conventional-commits-filter": "^2.0.7", -- "conventional-commits-parser": "^3.2.0", -- "git-raw-commits": "^2.0.8", -- "git-semver-tags": "^4.1.1", -- "meow": "^8.0.0", -- "q": "^1.5.1" -- }, -- "bin": { -- "conventional-recommended-bump": "cli.js" ++ "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=0.10" + } @@ -10033,9 +10225,10 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, ++ "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" - }, ++ }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } @@ -10045,34 +10238,34 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/convert-source-map": { - "version": "2.0.0", -- "license": "MIT", ++ "license": "ISC", ++ "engines": { ++ "node": ">=10" ++ } ++ }, ++ "node_modules/convert-source-map": { ++ "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "peer": true - }, - "node_modules/cookie": { - "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", -+ "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "dev": true, -- "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", -- "dev": true, -- "license": "MIT" ++ "license": "MIT", ++ "peer": true ++ }, ++ "node_modules/cookie": { ++ "version": "0.7.1", ++ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", ++ "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">= 0.6" ++ } ++ }, ++ "node_modules/cookie-signature": { ++ "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/core-js-compat": { - "version": "3.33.3", @@ -10080,20 +10273,20 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz", + "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "browserslist": "^4.22.1" + "browserslist": "^4.23.3" }, "funding": { "type": "opencollective", -@@ -6323,10 +7148,13 @@ +@@ -6323,10 +7738,14 @@ }, "node_modules/core-util-is": { "version": "1.0.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" ++ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "license": "MIT" }, "node_modules/cpu-features": { "version": "0.0.10", @@ -10102,7 +10295,7 @@ index a38125e..a1067b0 100644 "hasInstallScript": true, "dependencies": { "buildcheck": "~0.0.6", -@@ -6336,10 +7164,21 @@ +@@ -6336,8 +7755,21 @@ "node": ">=10.0.0" } }, @@ -10111,6 +10304,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "dev": true, ++ "license": "MIT", + "optional": true, + "dependencies": { + "buffer": "^5.1.0" @@ -10121,72 +10315,63 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "peer": true, - "bin": { - "crc32": "bin/crc32.njs" -@@ -6350,8 +7189,9 @@ +@@ -6350,6 +7782,8 @@ }, "node_modules/crc32-stream": { "version": "4.0.3", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "crc-32": "^1.2.0", -@@ -6363,12 +7203,14 @@ +@@ -6363,11 +7797,15 @@ }, "node_modules/create-require": { "version": "1.1.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cross-env": { "version": "7.0.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.1" - }, -@@ -6384,7 +7226,8 @@ +@@ -6384,6 +7822,8 @@ }, "node_modules/cross-spawn": { "version": "7.0.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", - "shebang-command": "^2.0.0", -@@ -6395,16 +7238,18 @@ +@@ -6395,7 +7835,9 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.1", -+ "version": "3.2.2", -+ "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz", -+ "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==", ++ "version": "3.2.3", ++ "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz", ++ "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=12 || >=16" - } +@@ -6404,6 +7846,8 @@ }, "node_modules/css-loader": { "version": "6.5.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz", + "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==", + "license": "MIT", "dependencies": { "icss-utils": "^5.1.0", - "postcss": "^8.2.15", -@@ -6426,22 +7271,10 @@ +@@ -6426,22 +7870,11 @@ "webpack": "^5.0.0" } }, @@ -10202,17 +10387,17 @@ index a38125e..a1067b0 100644 - }, "node_modules/css-loader/node_modules/semver": { - "version": "7.5.4", -- "license": "ISC", -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, "bin": { "semver": "bin/semver.js" }, -@@ -6449,13 +7282,10 @@ +@@ -6449,12 +7882,10 @@ "node": ">=10" } }, @@ -10222,84 +10407,81 @@ index a38125e..a1067b0 100644 - }, "node_modules/css-select": { "version": "4.3.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", + "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", - "css-what": "^6.0.1", -@@ -6469,7 +7299,8 @@ +@@ -6469,6 +7900,8 @@ }, "node_modules/css-select/node_modules/dom-serializer": { "version": "1.4.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", -@@ -6481,7 +7312,8 @@ +@@ -6481,6 +7914,8 @@ }, "node_modules/css-select/node_modules/domhandler": { "version": "4.3.1", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.2.0" - }, -@@ -6494,7 +7326,8 @@ +@@ -6494,6 +7929,8 @@ }, "node_modules/css-select/node_modules/domutils": { "version": "2.8.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", -@@ -6506,15 +7339,17 @@ +@@ -6506,6 +7943,8 @@ }, "node_modules/css-select/node_modules/entities": { "version": "2.2.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" - } +@@ -6513,6 +7952,8 @@ }, "node_modules/css-tree": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "mdn-data": "2.0.30", - "source-map-js": "^1.0.1" -@@ -6525,7 +7360,8 @@ +@@ -6525,6 +7966,8 @@ }, "node_modules/css-what": { "version": "6.1.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "license": "BSD-2-Clause", "engines": { "node": ">= 6" - }, -@@ -6535,7 +7371,8 @@ +@@ -6535,6 +7978,8 @@ }, "node_modules/cssesc": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", "bin": { "cssesc": "bin/cssesc" - }, -@@ -6549,24 +7386,81 @@ - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" +@@ -6546,42 +7991,108 @@ + "node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", +- "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" ++ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", ++ "license": "MIT" }, "node_modules/dargs": { - "version": "7.0.0", @@ -10307,29 +10489,42 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz", + "integrity": "sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, + } + }, +- "node_modules/dateformat": { +- "version": "3.0.3", + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", -+ "dev": true, -+ "dependencies": { + "dev": true, + "license": "MIT", +- "engines": { +- "node": "*" +- } +- }, +- "node_modules/debounce-fn": { +- "version": "4.0.0", +- "license": "MIT", + "dependencies": { +- "mimic-fn": "^3.0.0" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=10" + "node": ">= 0.4" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" + } + }, @@ -10338,6 +10533,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", @@ -10355,6 +10551,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", @@ -10365,118 +10562,116 @@ index a38125e..a1067b0 100644 + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/dateformat": { - "version": "3.0.3", ++ } ++ }, ++ "node_modules/dateformat": { ++ "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true, -- "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/debounce-fn": { - "version": "4.0.0", -- "license": "MIT", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": "*" ++ } ++ }, ++ "node_modules/debounce-fn": { ++ "version": "4.0.0", + "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz", + "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==", - "dependencies": { - "mimic-fn": "^3.0.0" - }, -@@ -6578,8 +7472,9 @@ ++ "license": "MIT", ++ "dependencies": { ++ "mimic-fn": "^3.0.0" ++ }, ++ "engines": { ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/debug": { - "version": "4.3.4", -- "license": "MIT", -+ "version": "4.3.6", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", -+ "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", ++ "version": "4.3.7", ++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", ++ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", "dependencies": { - "ms": "2.1.2" +- "ms": "2.1.2" ++ "ms": "^2.1.3" }, -@@ -6594,16 +7489,18 @@ + "engines": { + "node": ">=6.0" +@@ -6594,6 +8105,8 @@ }, "node_modules/decamelize": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -6602,6 +8115,8 @@ }, "node_modules/decamelize-keys": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" -@@ -6617,15 +7514,17 @@ +@@ -6617,6 +8132,8 @@ }, "node_modules/decamelize-keys/node_modules/map-obj": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -6625,6 +8142,8 @@ }, "node_modules/decompress-response": { "version": "6.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" - }, -@@ -6638,7 +7537,8 @@ +@@ -6638,6 +8157,8 @@ }, "node_modules/decompress-response/node_modules/mimic-response": { "version": "3.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "license": "MIT", "engines": { "node": ">=10" - }, -@@ -6648,20 +7548,23 @@ +@@ -6648,6 +8169,8 @@ }, "node_modules/deep-extend": { "version": "0.6.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "license": "MIT", "engines": { "node": ">=4.0.0" - } +@@ -6655,11 +8178,15 @@ }, "node_modules/deep-is": { "version": "0.1.4", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/default-gateway": { "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "dependencies": { - "execa": "^5.0.0" - }, -@@ -6669,38 +7572,128 @@ +@@ -6669,28 +8196,127 @@ "node": ">= 10" } }, @@ -10485,6 +10680,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", @@ -10508,6 +10704,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=10" + }, @@ -10520,6 +10717,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, ++ "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } @@ -10529,6 +10727,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=8" + }, @@ -10541,6 +10740,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, @@ -10552,22 +10752,24 @@ index a38125e..a1067b0 100644 + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", -+ "dev": true ++ "dev": true, ++ "license": "ISC" + }, + "node_modules/default-gateway/node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/defer-to-connect": { "version": "2.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "license": "MIT", "engines": { "node": ">=10" } @@ -10578,7 +10780,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", @@ -10599,215 +10801,195 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -6699,6 +8325,8 @@ }, "node_modules/define-properties": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", -@@ -6715,31 +7708,35 @@ +@@ -6715,6 +8343,8 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.4.0" - } +@@ -6723,6 +8353,8 @@ }, "node_modules/denque": { "version": "2.1.0", -- "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "license": "Apache-2.0", "engines": { "node": ">=0.10" - } +@@ -6730,6 +8362,8 @@ }, "node_modules/depd": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -6738,6 +8372,8 @@ }, "node_modules/destroy": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" -@@ -6747,49 +7744,56 @@ +@@ -6747,6 +8383,8 @@ }, "node_modules/detect-indent": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" +@@ -6754,7 +8392,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.2", -- "license": "Apache-2.0", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "license": "Apache-2.0", "engines": { "node": ">=8" - } +@@ -6762,6 +8402,8 @@ }, "node_modules/detect-newline": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -6770,16 +8412,22 @@ }, "node_modules/detect-node": { "version": "2.1.0", -- "devOptional": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", -+ "devOptional": true + "devOptional": true, + "license": "MIT" }, "node_modules/didyoumean": { "version": "1.2.2", -- "dev": true, -- "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", -+ "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/diff": { "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true, -- "license": "BSD-3-Clause", + "license": "BSD-3-Clause", "engines": { - "node": ">=0.3.1" - } +@@ -6788,6 +8436,8 @@ }, "node_modules/dir-compare": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz", + "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "buffer-equal": "^1.0.0", - "minimatch": "^3.0.4" -@@ -6797,8 +7801,9 @@ +@@ -6797,6 +8447,8 @@ }, "node_modules/dir-compare/node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -@@ -6806,8 +7811,9 @@ +@@ -6806,6 +8458,8 @@ }, "node_modules/dir-compare/node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -6817,8 +7823,9 @@ +@@ -6817,6 +8471,8 @@ }, "node_modules/dir-glob": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "path-type": "^4.0.0" - }, -@@ -6828,12 +7835,14 @@ +@@ -6828,10 +8484,14 @@ }, "node_modules/discontinuous-range": { "version": "1.0.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", -+ "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==" ++ "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==", + "license": "MIT" }, "node_modules/dmg-builder": { "version": "24.13.3", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.13.3.tgz", + "integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "app-builder-lib": "24.13.3", - "builder-util": "24.13.1", -@@ -6848,8 +7857,9 @@ +@@ -6848,6 +8508,8 @@ }, "node_modules/dmg-builder/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", -@@ -6861,8 +7871,9 @@ +@@ -6861,6 +8523,8 @@ }, "node_modules/dmg-builder/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "universalify": "^2.0.0" - }, -@@ -6872,21 +7883,68 @@ +@@ -6872,19 +8536,71 @@ }, "node_modules/dmg-builder/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", -+ "dev": true, -+ "engines": { -+ "node": ">= 10.0.0" -+ } -+ }, + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, +- "node_modules/dns-equal": { +- "version": "1.0.0", + "node_modules/dmg-license": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", + "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", -+ "dev": true, + "dev": true, +- "license": "MIT" ++ "license": "MIT", + "optional": true, + "os": [ + "darwin" @@ -10833,10 +11015,8 @@ index a38125e..a1067b0 100644 + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">= 10.0.0" ++ "dev": true, ++ "license": "MIT", + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", @@ -10847,16 +11027,14 @@ index a38125e..a1067b0 100644 + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" - } - }, -- "node_modules/dns-equal": { -- "version": "1.0.0", ++ } ++ }, + "node_modules/dmg-license/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, -- "license": "MIT" ++ "dev": true, ++ "license": "MIT", + "optional": true }, "node_modules/dns-packet": { @@ -10864,41 +11042,36 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@leichtgewicht/ip-codec": "^2.0.1" - }, -@@ -6896,8 +7954,9 @@ +@@ -6896,6 +8612,8 @@ }, "node_modules/doctrine": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "esutils": "^2.0.2" - }, -@@ -6907,14 +7966,16 @@ +@@ -6907,6 +8625,8 @@ }, "node_modules/dom-converter": { "version": "0.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", + "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", + "license": "MIT", "dependencies": { "utila": "~0.4" - } +@@ -6914,6 +8634,8 @@ }, "node_modules/dom-serializer": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", -@@ -6926,17 +7987,19 @@ +@@ -6926,6 +8648,8 @@ }, "node_modules/domelementtype": { "version": "2.3.0", @@ -10907,49 +11080,43 @@ index a38125e..a1067b0 100644 "funding": [ { "type": "github", - "url": "https://github.com/sponsors/fb55" - } -- ], -- "license": "BSD-2-Clause" -+ ] +@@ -6936,6 +8660,8 @@ }, "node_modules/domhandler": { "version": "5.0.3", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" - }, -@@ -6949,7 +8012,8 @@ +@@ -6949,6 +8675,8 @@ }, "node_modules/domutils": { "version": "3.1.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", - "domelementtype": "^2.3.0", -@@ -6961,42 +8025,45 @@ +@@ -6961,6 +8689,8 @@ }, "node_modules/dot-case": { "version": "3.0.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "license": "MIT", "dependencies": { "no-case": "^3.0.4", - "tslib": "^2.0.3" +@@ -6968,20 +8698,22 @@ } }, "node_modules/dot-prop": { - "version": "6.0.1", -- "license": "MIT", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "license": "MIT", "dependencies": { "is-obj": "^2.0.0" }, @@ -10966,95 +11133,79 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", + "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "engines": { - "node": ">=10" - } +@@ -6990,11 +8722,15 @@ }, "node_modules/dotenv-expand": { "version": "5.1.0", -- "dev": true, -- "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", + "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", -+ "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/dotgitignore": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz", + "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "find-up": "^3.0.0", - "minimatch": "^3.0.4" -@@ -7007,8 +8074,9 @@ +@@ -7007,6 +8743,8 @@ }, "node_modules/dotgitignore/node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -@@ -7016,8 +8084,9 @@ +@@ -7016,6 +8754,8 @@ }, "node_modules/dotgitignore/node_modules/find-up": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "locate-path": "^3.0.0" - }, -@@ -7027,8 +8096,9 @@ +@@ -7027,6 +8767,8 @@ }, "node_modules/dotgitignore/node_modules/locate-path": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" -@@ -7039,8 +8109,9 @@ +@@ -7039,6 +8781,8 @@ }, "node_modules/dotgitignore/node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -7050,8 +8121,9 @@ +@@ -7050,6 +8794,8 @@ }, "node_modules/dotgitignore/node_modules/p-limit": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-try": "^2.0.0" - }, -@@ -7064,8 +8136,9 @@ +@@ -7064,6 +8810,8 @@ }, "node_modules/dotgitignore/node_modules/p-locate": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-limit": "^2.0.0" - }, -@@ -7073,28 +8146,32 @@ +@@ -7073,26 +8821,34 @@ "node": ">=6" } }, @@ -11065,7 +11216,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=4" @@ -11073,30 +11224,26 @@ index a38125e..a1067b0 100644 }, "node_modules/eastasianwidth": { "version": "0.2.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ee-first": { "version": "1.1.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ejs": { "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "jake": "^10.8.5" - }, -@@ -7106,9 +8183,9 @@ +@@ -7106,10 +8862,11 @@ } }, "node_modules/electron": { @@ -11107,62 +11254,56 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.9.tgz", + "integrity": "sha512-ArxgdGHVu3o5uaP+Tqj8cJDvU03R6vrGrOqiMs7JXLnvQHMqXJIIxmFKQAIdJW8VoT3ac3hD21tA7cPO10RLow==", "hasInstallScript": true, ++ "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", -@@ -7124,8 +8201,9 @@ + "@types/node": "^20.9.0", +@@ -7124,6 +8881,8 @@ }, "node_modules/electron-builder": { "version": "24.13.3", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.13.3.tgz", + "integrity": "sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "app-builder-lib": "24.13.3", - "builder-util": "24.13.1", -@@ -7149,8 +8227,9 @@ +@@ -7149,6 +8908,8 @@ }, "node_modules/electron-builder-squirrel-windows": { "version": "24.13.3", + "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-24.13.3.tgz", + "integrity": "sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "app-builder-lib": "24.13.3", -@@ -7161,8 +8240,9 @@ +@@ -7161,6 +8922,8 @@ }, "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "graceful-fs": "^4.2.0", -@@ -7175,8 +8255,9 @@ +@@ -7175,6 +8938,8 @@ }, "node_modules/electron-builder-squirrel-windows/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "universalify": "^2.0.0" -@@ -7187,30 +8268,19 @@ +@@ -7187,6 +8952,8 @@ }, "node_modules/electron-builder-squirrel-windows/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "engines": { +@@ -7194,21 +8961,10 @@ "node": ">= 10.0.0" } }, @@ -11184,29 +11325,25 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", -@@ -7222,8 +8292,9 @@ +@@ -7222,6 +8978,8 @@ }, "node_modules/electron-builder/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "universalify": "^2.0.0" - }, -@@ -7233,72 +8304,26 @@ +@@ -7233,63 +8991,18 @@ }, "node_modules/electron-builder/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -11262,114 +11399,102 @@ index a38125e..a1067b0 100644 - }, "node_modules/electron-log": { - "version": "5.0.1", -- "license": "MIT", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.4.tgz", + "integrity": "sha512-h88rs4To/wa1LQm/sfik0+BEbLXRlSfzSt8baG4R2okitbCBdT2SMrg6WHo/MD6T75NCkLHkrjoXQEVGAcnI8w==", + "license": "MIT", "engines": { "node": ">= 14" - } +@@ -7297,6 +9010,8 @@ }, "node_modules/electron-publish": { "version": "24.13.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz", + "integrity": "sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/fs-extra": "^9.0.11", - "builder-util": "24.13.1", -@@ -7311,8 +8336,9 @@ +@@ -7311,6 +9026,8 @@ }, "node_modules/electron-publish/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", -@@ -7324,8 +8350,9 @@ +@@ -7324,6 +9041,8 @@ }, "node_modules/electron-publish/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "universalify": "^2.0.0" - }, -@@ -7335,15 +8362,17 @@ +@@ -7335,6 +9054,8 @@ }, "node_modules/electron-publish/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 10.0.0" - } +@@ -7343,6 +9064,8 @@ }, "node_modules/electron-store": { "version": "8.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-8.1.0.tgz", + "integrity": "sha512-2clHg/juMjOH0GT9cQ6qtmIvK183B39ZXR0bUoPwKwYHJsEF3quqyDzMFUAu+0OP8ijmN2CbPRAelhNbWUbzwA==", + "license": "MIT", "dependencies": { "conf": "^10.2.0", - "type-fest": "^2.17.0" -@@ -7353,12 +8382,14 @@ +@@ -7353,11 +9076,15 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.594", -- "license": "ISC" -+ "version": "1.5.13", -+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz", -+ "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==" ++ "version": "1.5.41", ++ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz", ++ "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==", + "license": "ISC" }, "node_modules/electron-updater": { "version": "4.6.5", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz", + "integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==", + "license": "MIT", "dependencies": { "@types/semver": "^7.3.6", - "builder-util-runtime": "8.9.2", -@@ -7372,7 +8403,8 @@ +@@ -7372,6 +9099,8 @@ }, "node_modules/electron-updater/node_modules/builder-util-runtime": { "version": "8.9.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", + "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", + "license": "MIT", "dependencies": { "debug": "^4.3.2", - "sax": "^1.2.4" -@@ -7383,7 +8415,8 @@ +@@ -7383,6 +9112,8 @@ }, "node_modules/electron-updater/node_modules/fs-extra": { "version": "10.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", -@@ -7395,7 +8428,8 @@ +@@ -7395,6 +9126,8 @@ }, "node_modules/electron-updater/node_modules/jsonfile": { "version": "6.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", "dependencies": { "universalify": "^2.0.0" - }, -@@ -7403,22 +8437,10 @@ +@@ -7403,22 +9136,11 @@ "graceful-fs": "^4.1.6" } }, @@ -11385,23 +11510,23 @@ index a38125e..a1067b0 100644 - }, "node_modules/electron-updater/node_modules/semver": { - "version": "7.5.4", -- "license": "ISC", -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, "bin": { "semver": "bin/semver.js" }, -@@ -7428,18 +8450,16 @@ +@@ -7428,17 +9150,17 @@ }, "node_modules/electron-updater/node_modules/universalify": { "version": "2.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -11412,21 +11537,20 @@ index a38125e..a1067b0 100644 - }, "node_modules/electron-window-state": { "version": "5.0.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz", + "integrity": "sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==", + "license": "MIT", "dependencies": { "jsonfile": "^4.0.0", - "mkdirp": "^0.5.1" -@@ -7449,49 +8469,61 @@ +@@ -7449,26 +9171,40 @@ } }, "node_modules/electron/node_modules/@types/node": { - "version": "20.12.12", -- "license": "MIT", -+ "version": "20.16.1", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz", -+ "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==", ++ "version": "20.16.13", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.13.tgz", ++ "integrity": "sha512-GjQ7im10B0labo8ZGXDGROUl9k0BNyDgzfGpb4g/cl+4yYDWVKcozANF4FGr4/p0O/rAkQClM6Wiwkije++1Tg==", + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" @@ -11435,121 +11559,115 @@ index a38125e..a1067b0 100644 + "node_modules/electron/node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", -+ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" ++ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", ++ "license": "MIT" + }, "node_modules/emoji-regex": { "version": "8.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/emojis-list": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/encodeurl": { - "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", -+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", +- "version": "1.0.2", ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", ++ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -7477,6 +9213,8 @@ }, "node_modules/encoding": { "version": "0.1.13", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", "dependencies": { "iconv-lite": "^0.6.2" - } +@@ -7484,13 +9222,17 @@ }, "node_modules/end-of-stream": { "version": "1.4.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", "dependencies": { "once": "^1.4.0" } }, "node_modules/enhanced-resolve": { - "version": "5.16.1", -- "license": "MIT", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" -@@ -7502,8 +8534,9 @@ +@@ -7502,6 +9244,8 @@ }, "node_modules/enquirer": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" -@@ -7514,7 +8547,8 @@ +@@ -7514,6 +9258,8 @@ }, "node_modules/entities": { "version": "4.5.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" - }, -@@ -7524,14 +8558,16 @@ +@@ -7524,13 +9270,17 @@ }, "node_modules/env-paths": { "version": "2.2.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/envinfo": { - "version": "7.11.0", -- "license": "MIT", -+ "version": "7.13.0", -+ "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", -+ "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", ++ "version": "7.14.0", ++ "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", ++ "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", + "license": "MIT", "bin": { "envinfo": "dist/cli.js" - }, -@@ -7541,61 +8577,71 @@ +@@ -7541,11 +9291,15 @@ }, "node_modules/err-code": { "version": "2.0.3", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/error-ex": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "is-arrayish": "^0.2.1" +@@ -7553,49 +9307,58 @@ } }, "node_modules/es-abstract": { @@ -11566,6 +11684,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", @@ -11638,15 +11757,18 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -7604,18 +8650,53 @@ +@@ -7604,18 +9367,58 @@ "url": "https://github.com/sponsors/ljharb" } }, +- "node_modules/es-module-lexer": { +- "version": "1.5.2", + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "devOptional": true, ++ "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, @@ -11659,36 +11781,37 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "devOptional": true, ++ "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, - "node_modules/es-module-lexer": { -- "version": "1.5.2", -- "license": "MIT" ++ "node_modules/es-module-lexer": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", -+ "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==" -+ }, ++ "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "license": "MIT" + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } - }, ++ }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", @@ -11699,75 +11822,68 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -7623,16 +8704,18 @@ +@@ -7623,6 +9426,8 @@ }, "node_modules/es-shim-unscopables": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "hasown": "^2.0.0" - } +@@ -7631,6 +9436,8 @@ }, "node_modules/es-to-primitive": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", -@@ -7647,25 +8730,29 @@ +@@ -7647,11 +9454,15 @@ }, "node_modules/es6-error": { "version": "4.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "license": "MIT", "optional": true }, "node_modules/escalade": { - "version": "3.1.1", -- "license": "MIT", -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", -+ "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", ++ "version": "3.2.0", ++ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", ++ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", "engines": { "node": ">=6" - } +@@ -7659,11 +9470,15 @@ }, "node_modules/escape-html": { "version": "1.0.3", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/escape-string-regexp": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=10" - }, -@@ -7675,8 +8762,9 @@ +@@ -7675,6 +9490,9 @@ }, "node_modules/eslint": { "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", ++ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", -@@ -7731,6 +8819,8 @@ +@@ -7731,6 +9549,8 @@ }, "node_modules/eslint-config-standard": { "version": "16.0.3", @@ -11776,141 +11892,117 @@ index a38125e..a1067b0 100644 "dev": true, "funding": [ { -@@ -7746,7 +8836,6 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT", - "peerDependencies": { - "eslint": "^7.12.1", - "eslint-plugin-import": "^2.22.1", -@@ -7756,8 +8845,9 @@ +@@ -7756,6 +9576,8 @@ }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.13.0", -@@ -7766,16 +8856,18 @@ +@@ -7766,6 +9588,8 @@ }, "node_modules/eslint-import-resolver-node/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ms": "^2.1.1" +@@ -7773,7 +9597,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.8.0", -+ "version": "2.8.2", -+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.2.tgz", -+ "integrity": "sha512-3XnC5fDyc8M4J2E8pt8pmSVRX2M+5yWMCfI/kDZwauQeFgzQOuhcRBFKjTeJagqgk4sFKxe1mvNVnaWwImx/Tg==", ++ "version": "2.12.0", ++ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", ++ "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "debug": "^3.2.7" - }, -@@ -7790,16 +8882,18 @@ +@@ -7790,6 +9616,8 @@ }, "node_modules/eslint-module-utils/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ms": "^2.1.1" - } +@@ -7798,6 +9626,8 @@ }, "node_modules/eslint-plugin-es": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", + "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" -@@ -7816,8 +8910,9 @@ +@@ -7816,6 +9646,8 @@ }, "node_modules/eslint-plugin-es/node_modules/eslint-utils": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, -@@ -7830,16 +8925,18 @@ +@@ -7830,6 +9662,8 @@ }, "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "engines": { - "node": ">=4" - } +@@ -7838,6 +9672,8 @@ }, "node_modules/eslint-plugin-import": { "version": "2.24.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz", + "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "array-includes": "^3.1.3", - "array.prototype.flat": "^1.2.4", -@@ -7866,52 +8963,125 @@ +@@ -7866,6 +9702,8 @@ }, "node_modules/eslint-plugin-import/node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } +@@ -7875,6 +9713,8 @@ }, -- "node_modules/eslint-plugin-import/node_modules/debug": { -- "version": "2.6.9", -+ "node_modules/eslint-plugin-import/node_modules/debug": { -+ "version": "2.6.9", + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dev": true, -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/eslint-plugin-import/node_modules/doctrine": { -+ "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -7883,6 +9723,8 @@ + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", -+ "dev": true, -+ "dependencies": { -+ "esutils": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, + "dev": true, + "license": "Apache-2.0", + "dependencies": { +@@ -7892,8 +9734,37 @@ + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, @@ -11923,6 +12015,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" @@ -11931,179 +12024,148 @@ index a38125e..a1067b0 100644 + "node": ">=4" + } + }, -+ "node_modules/eslint-plugin-import/node_modules/minimatch": { -+ "version": "3.1.2", + "node_modules/eslint-plugin-import/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dev": true, -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/eslint-plugin-import/node_modules/ms": { -+ "version": "2.0.0", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -7905,11 +9776,61 @@ + }, + "node_modules/eslint-plugin-import/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true -+ }, + "dev": true, + "license": "MIT" + }, + "node_modules/eslint-plugin-import/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, -- "license": "MIT", - "dependencies": { -- "ms": "2.0.0" ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" - } - }, -- "node_modules/eslint-plugin-import/node_modules/doctrine": { -- "version": "2.1.0", ++ } ++ }, + "node_modules/eslint-plugin-import/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", - "dev": true, -- "license": "Apache-2.0", - "dependencies": { -- "esutils": "^2.0.2" ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { + "p-limit": "^1.1.0" - }, - "engines": { -- "node": ">=0.10.0" ++ }, ++ "engines": { + "node": ">=4" - } - }, -- "node_modules/eslint-plugin-import/node_modules/minimatch": { -- "version": "3.1.2", ++ } ++ }, + "node_modules/eslint-plugin-import/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", - "dev": true, -- "license": "ISC", -- "dependencies": { -- "brace-expansion": "^1.1.7" -- }, - "engines": { -- "node": "*" ++ "dev": true, ++ "license": "MIT", ++ "engines": { + "node": ">=4" - } - }, -- "node_modules/eslint-plugin-import/node_modules/ms": { -- "version": "2.0.0", ++ } ++ }, + "node_modules/eslint-plugin-import/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, -- "license": "MIT" ++ "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=4" + } - }, ++ }, "node_modules/eslint-plugin-import/node_modules/pkg-up": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "find-up": "^2.1.0" - }, -@@ -7921,8 +9091,9 @@ +@@ -7921,6 +9842,8 @@ }, "node_modules/eslint-plugin-node": { "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", -@@ -7940,8 +9111,9 @@ +@@ -7940,6 +9863,8 @@ }, "node_modules/eslint-plugin-node/node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -@@ -7949,8 +9121,9 @@ +@@ -7949,6 +9874,8 @@ }, "node_modules/eslint-plugin-node/node_modules/eslint-utils": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, -@@ -7963,16 +9136,18 @@ +@@ -7963,6 +9890,8 @@ }, "node_modules/eslint-plugin-node/node_modules/eslint-visitor-keys": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "engines": { - "node": ">=4" - } +@@ -7971,6 +9900,8 @@ }, "node_modules/eslint-plugin-node/node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -7982,8 +9157,9 @@ +@@ -7982,6 +9913,8 @@ }, "node_modules/eslint-plugin-promise": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz", + "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==", "dev": true, -- "license": "ISC", + "license": "ISC", "engines": { - "node": "^10.12.0 || >=12.0.0" - }, -@@ -7993,16 +9169,18 @@ +@@ -7993,6 +9926,8 @@ }, "node_modules/eslint-plugin-simple-import-sort": { "version": "10.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", + "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", "dev": true, -- "license": "MIT", + "license": "MIT", "peerDependencies": { - "eslint": ">=5.0.0" - } +@@ -8001,6 +9936,8 @@ }, "node_modules/eslint-plugin-vue": { "version": "8.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz", + "integrity": "sha512-Rlhhy5ltzde0sRwSkqHuNePTXLMMaJ5+qsQubM4RYloYsQ8cXlnJT5MDaCzSirkGADipOHtmQXIbbPFAzUrADg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-utils": "^3.0.0", - "natural-compare": "^1.4.0", -@@ -8016,24 +9194,11 @@ +@@ -8016,24 +9953,12 @@ "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0" } }, @@ -12124,14 +12186,14 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -8041,14 +9206,10 @@ +@@ -8041,13 +9966,10 @@ "node": ">=10" } }, @@ -12142,41 +12204,37 @@ index a38125e..a1067b0 100644 - }, "node_modules/eslint-scope": { "version": "5.1.1", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" -@@ -8059,8 +9220,9 @@ +@@ -8059,6 +9981,8 @@ }, "node_modules/eslint-utils": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, -@@ -8076,32 +9238,52 @@ +@@ -8076,6 +10000,8 @@ }, "node_modules/eslint-visitor-keys": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "engines": { - "node": ">=10" - } +@@ -8084,14 +10010,35 @@ }, "node_modules/eslint/node_modules/@babel/code-frame": { "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { "@babel/highlight": "^7.10.4" } @@ -12186,6 +12244,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", @@ -12202,41 +12261,36 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "sprintf-js": "~1.0.2" - } +@@ -8100,6 +10047,8 @@ }, "node_modules/eslint/node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -@@ -8109,8 +9291,9 @@ +@@ -8109,6 +10058,8 @@ }, "node_modules/eslint/node_modules/eslint-utils": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, -@@ -8123,16 +9306,18 @@ +@@ -8123,6 +10074,8 @@ }, "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "engines": { - "node": ">=4" +@@ -8130,7 +10083,9 @@ } }, "node_modules/eslint/node_modules/globals": { @@ -12245,38 +12299,37 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "type-fest": "^0.20.2" - }, -@@ -8145,16 +9330,18 @@ +@@ -8145,6 +10100,8 @@ }, "node_modules/eslint/node_modules/ignore": { "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 4" - } +@@ -8153,6 +10110,8 @@ }, "node_modules/eslint/node_modules/js-yaml": { "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" -@@ -8163,21 +9350,17 @@ +@@ -8163,19 +10122,17 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/eslint/node_modules/lru-cache": { - "version": "6.0.0", -- "dev": true, ++ "node_modules/eslint/node_modules/json-schema-traverse": { ++ "version": "0.4.1", ++ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" @@ -12284,22 +12337,16 @@ index a38125e..a1067b0 100644 - "engines": { - "node": ">=10" - } -+ "node_modules/eslint/node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", -+ "dev": true ++ "license": "MIT" }, "node_modules/eslint/node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -8186,12 +9369,10 @@ +@@ -8186,12 +10143,11 @@ } }, "node_modules/eslint/node_modules/semver": { @@ -12308,33 +12355,30 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -8201,13 +9382,15 @@ +@@ -8201,11 +10157,15 @@ }, "node_modules/eslint/node_modules/sprintf-js": { "version": "1.0.3", -- "dev": true, -- "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", -+ "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/eslint/node_modules/type-fest": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, -- "license": "(MIT OR CC0-1.0)", + "license": "(MIT OR CC0-1.0)", "engines": { - "node": ">=10" - }, -@@ -8215,15 +9398,11 @@ +@@ -8215,13 +10175,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, @@ -12348,32 +12392,27 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", -@@ -8235,16 +9414,18 @@ +@@ -8235,6 +10192,8 @@ }, "node_modules/espree/node_modules/eslint-visitor-keys": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "engines": { - "node": ">=4" - } +@@ -8243,6 +10202,8 @@ }, "node_modules/esprima": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" -@@ -8254,9 +9435,10 @@ +@@ -8254,7 +10215,9 @@ } }, "node_modules/esquery": { @@ -12382,100 +12421,93 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, -- "license": "BSD-3-Clause", + "license": "BSD-3-Clause", "dependencies": { - "estraverse": "^5.1.0" - }, -@@ -8266,15 +9448,17 @@ +@@ -8266,6 +10229,8 @@ }, "node_modules/esquery/node_modules/estraverse": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "engines": { - "node": ">=4.0" - } +@@ -8274,6 +10239,8 @@ }, "node_modules/esrecurse": { "version": "4.3.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" - }, -@@ -8284,76 +9468,102 @@ +@@ -8284,6 +10251,8 @@ }, "node_modules/esrecurse/node_modules/estraverse": { "version": "5.3.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" - } +@@ -8291,6 +10260,8 @@ }, "node_modules/estraverse": { "version": "4.3.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" - } +@@ -8298,10 +10269,14 @@ }, "node_modules/estree-walker": { "version": "2.0.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", -+ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" ++ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" }, "node_modules/esutils": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "engines": { - "node": ">=0.10.0" - } +@@ -8310,6 +10285,8 @@ }, "node_modules/etag": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" - } +@@ -8318,42 +10295,68 @@ }, "node_modules/eventemitter3": { "version": "4.0.7", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/events": { "version": "3.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "license": "MIT", "engines": { "node": ">=0.8.x" } }, "node_modules/execa": { - "version": "5.1.1", -- "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", + "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", @@ -12504,12 +12536,12 @@ index a38125e..a1067b0 100644 }, - "node_modules/execa/node_modules/get-stream": { - "version": "6.0.1", -- "license": "MIT", + "node_modules/execa/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=10" + "node": ">=12" @@ -12523,6 +12555,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "mimic-fn": "^4.0.0" + }, @@ -12531,27 +12564,64 @@ index a38125e..a1067b0 100644 }, "funding": { "url": "https://github.com/sponsors/sindresorhus" -@@ -8361,15 +9571,17 @@ +@@ -8361,42 +10364,46 @@ }, "node_modules/expand-template": { "version": "2.0.3", -- "license": "(MIT OR WTFPL)", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "license": "(MIT OR WTFPL)", "engines": { "node": ">=6" } }, "node_modules/express": { - "version": "4.19.2", -+ "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", -+ "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", +- "version": "4.19.2", ++ "version": "4.21.1", ++ "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", ++ "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", -@@ -8407,28 +9619,26 @@ +- "body-parser": "1.20.2", ++ "body-parser": "1.20.3", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", +- "cookie": "0.6.0", ++ "cookie": "0.7.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", +- "encodeurl": "~1.0.2", ++ "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", +- "finalhandler": "1.2.0", ++ "finalhandler": "1.3.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", +- "merge-descriptors": "1.0.1", ++ "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", +- "path-to-regexp": "0.1.7", ++ "path-to-regexp": "0.1.10", + "proxy-addr": "~2.0.7", +- "qs": "6.11.0", ++ "qs": "6.13.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", +- "send": "0.18.0", +- "serve-static": "1.15.0", ++ "send": "0.19.0", ++ "serve-static": "1.16.2", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", +@@ -8407,13 +10414,10 @@ "node": ">= 0.10.0" } }, @@ -12565,50 +12635,43 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ms": "2.0.0" - } +@@ -8422,11 +10426,15 @@ }, "node_modules/express/node_modules/ms": { "version": "2.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/external-editor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", -@@ -8440,8 +9650,9 @@ +@@ -8440,6 +10448,8 @@ }, "node_modules/external-editor/node_modules/iconv-lite": { "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, -@@ -8451,7 +9662,8 @@ +@@ -8451,6 +10461,8 @@ }, "node_modules/extract-zip": { "version": "2.0.1", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "license": "BSD-2-Clause", "dependencies": { "debug": "^4.1.1", - "get-stream": "^5.1.0", -@@ -8467,14 +9679,40 @@ +@@ -8467,12 +10479,42 @@ "@types/yauzl": "^2.9.1" } }, @@ -12616,6 +12679,7 @@ index a38125e..a1067b0 100644 + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", ++ "license": "MIT", + "dependencies": { + "pump": "^3.0.0" + }, @@ -12634,49 +12698,48 @@ index a38125e..a1067b0 100644 + "engines": [ + "node >=0.6.0" + ], ++ "license": "MIT", + "optional": true + }, "node_modules/fast-deep-equal": { "version": "3.1.3", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" ++ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "license": "MIT" }, "node_modules/fast-glob": { "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", -@@ -8488,32 +9726,42 @@ +@@ -8488,22 +10530,36 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" ++ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", -+ "dev": true -+ }, -+ "node_modules/fast-uri": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", -+ "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==" + "dev": true, + "license": "MIT" }, ++ "node_modules/fast-uri": { ++ "version": "3.0.3", ++ "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", ++ "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", ++ "license": "BSD-3-Clause" ++ }, "node_modules/fastest-levenshtein": { "version": "1.0.16", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "license": "MIT", "engines": { "node": ">= 4.9.1" } @@ -12687,72 +12750,63 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "reusify": "^1.0.4" - } +@@ -8512,6 +10568,8 @@ }, "node_modules/faye-websocket": { "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "websocket-driver": ">=0.5.1" - }, -@@ -8523,15 +9771,17 @@ +@@ -8523,6 +10581,8 @@ }, "node_modules/fd-slicer": { "version": "1.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "license": "MIT", "dependencies": { "pend": "~1.2.0" - } +@@ -8530,6 +10590,8 @@ }, "node_modules/figures": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "escape-string-regexp": "^1.0.5" - }, -@@ -8544,16 +9794,18 @@ +@@ -8544,6 +10606,8 @@ }, "node_modules/figures/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.8.0" - } +@@ -8552,6 +10616,8 @@ }, "node_modules/file-entry-cache": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" - }, -@@ -8563,7 +9815,8 @@ +@@ -8563,6 +10629,8 @@ }, "node_modules/file-loader": { "version": "6.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", + "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", + "license": "MIT", "dependencies": { "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0" -@@ -8579,9 +9832,38 @@ +@@ -8579,8 +10647,41 @@ "webpack": "^4.0.0 || ^5.0.0" } }, @@ -12760,6 +12814,7 @@ index a38125e..a1067b0 100644 + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", ++ "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", @@ -12775,6 +12830,7 @@ index a38125e..a1067b0 100644 + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ++ "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } @@ -12782,83 +12838,85 @@ index a38125e..a1067b0 100644 + "node_modules/file-loader/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", ++ "license": "MIT" + }, "node_modules/file-loader/node_modules/schema-utils": { "version": "3.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", -@@ -8597,19 +9879,22 @@ +@@ -8597,10 +10698,14 @@ }, "node_modules/file-uri-to-path": { "version": "1.0.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", -+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" ++ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "license": "MIT" }, "node_modules/filelist": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "minimatch": "^5.0.1" +@@ -8608,7 +10713,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", -- "license": "MIT", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" - }, -@@ -8619,8 +9904,9 @@ +@@ -8618,12 +10725,14 @@ + } }, "node_modules/finalhandler": { - "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", -+ "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", +- "version": "1.2.0", ++ "version": "1.3.1", ++ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", ++ "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", -@@ -8636,20 +9922,23 @@ +- "encodeurl": "~1.0.2", ++ "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", +@@ -8636,6 +10745,8 @@ }, "node_modules/finalhandler/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ms": "2.0.0" - } +@@ -8644,11 +10755,15 @@ }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/find-cache-dir": { "version": "3.3.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "license": "MIT", "dependencies": { "commondir": "^1.0.1", - "make-dir": "^3.0.2", -@@ -8663,27 +9952,35 @@ +@@ -8663,18 +10778,27 @@ } }, "node_modules/find-up": { @@ -12867,7 +12925,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz", + "integrity": "sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "locate-path": "^2.0.0" + "locate-path": "^7.2.0", @@ -12884,70 +12942,60 @@ index a38125e..a1067b0 100644 }, "node_modules/flat": { "version": "5.0.2", -- "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" - } +@@ -8682,6 +10806,8 @@ }, "node_modules/flat-cache": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", -@@ -8694,13 +9991,15 @@ +@@ -8694,12 +10820,16 @@ } }, "node_modules/flatted": { - "version": "3.2.9", -- "dev": true, -- "license": "ISC" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/floating-vue": { - "version": "2.0.0-beta.24", -- "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0.tgz", + "integrity": "sha512-YSffLYOjoaaPPBZc7VQR2qMCQ7xeXuh7i8a2u8WOdSmkjTtKtZpj2aaJnLtZRHmehrMHyCgtSxLu8jFNNX2sVw==", + "license": "MIT", "dependencies": { "@floating-ui/dom": "~1.1.1", - "vue-resize": "^2.0.0-alpha.1" -@@ -8717,6 +10016,8 @@ +@@ -8716,7 +10846,9 @@ + } }, "node_modules/follow-redirects": { - "version": "1.15.6", -+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", -+ "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", +- "version": "1.15.6", ++ "version": "1.15.9", ++ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", ++ "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "dev": true, "funding": [ { -@@ -8724,7 +10025,6 @@ - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], -- "license": "MIT", - "engines": { - "node": ">=4.0" - }, -@@ -8736,16 +10036,18 @@ +@@ -8736,6 +10868,8 @@ }, "node_modules/for-each": { "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "is-callable": "^1.1.3" +@@ -8743,7 +10877,9 @@ } }, "node_modules/foreground-child": { @@ -12956,11 +13004,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" -@@ -8757,21 +10059,11 @@ +@@ -8757,19 +10893,10 @@ "url": "https://github.com/sponsors/isaacs" } }, @@ -12976,113 +13022,102 @@ index a38125e..a1067b0 100644 - } - }, "node_modules/form-data": { - "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", -+ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", +- "version": "4.0.0", ++ "version": "4.0.1", ++ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", ++ "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", -@@ -8783,24 +10075,27 @@ +@@ -8783,6 +10910,8 @@ }, "node_modules/forwarded": { "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" - } +@@ -8791,6 +10920,8 @@ }, "node_modules/fresh": { "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" - } +@@ -8799,6 +10930,8 @@ }, "node_modules/fs-access": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "integrity": "sha512-05cXDIwNbFaoFWaz5gNHlUTbH5whiss/hr/ibzPd4MH3cR4w0ZKeIPiVdbyJurg3O5r/Bjpvn9KOb1/rPMf3nA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "null-check": "^1.0.0" - }, -@@ -8810,11 +10105,13 @@ +@@ -8810,10 +10943,14 @@ }, "node_modules/fs-constants": { "version": "1.0.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", -+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" ++ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" }, "node_modules/fs-extra": { "version": "8.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", -@@ -8826,8 +10123,9 @@ +@@ -8826,6 +10963,8 @@ }, "node_modules/fs-minipass": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "minipass": "^3.0.0" - }, -@@ -8837,8 +10135,9 @@ +@@ -8837,6 +10976,8 @@ }, "node_modules/fs-minipass/node_modules/minipass": { "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "yallist": "^4.0.0" - }, -@@ -8848,29 +10147,47 @@ +@@ -8848,20 +10989,42 @@ }, "node_modules/fs-minipass/node_modules/yallist": { "version": "4.0.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fs-monkey": { - "version": "1.0.5", -- "dev": true, -- "license": "Unlicense" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz", + "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==", -+ "dev": true + "dev": true, + "license": "Unlicense" }, "node_modules/fs.realpath": { "version": "1.0.0", -- "license": "ISC" + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" -+ }, ++ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, ++ "license": "MIT", + "optional": true, + "os": [ + "darwin" @@ -13090,72 +13125,67 @@ index a38125e..a1067b0 100644 + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } - }, ++ }, "node_modules/function-bind": { "version": "1.1.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" - } +@@ -8869,6 +11032,8 @@ }, "node_modules/function.prototype.name": { "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", -@@ -8886,27 +10203,31 @@ +@@ -8886,11 +11051,15 @@ }, "node_modules/functional-red-black-tree": { "version": "1.0.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/functions-have-names": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "funding": { - "url": "https://github.com/sponsors/ljharb" - } +@@ -8899,6 +11068,8 @@ }, "node_modules/generate-function": { "version": "2.3.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", + "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==", + "license": "MIT", "dependencies": { "is-property": "^1.0.2" - } +@@ -8906,6 +11077,8 @@ }, "node_modules/gensync": { "version": "1.0.0-beta.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "license": "MIT", "peer": true, "engines": { - "node": ">=6.9.0" -@@ -8914,30 +10235,37 @@ +@@ -8914,6 +11087,8 @@ }, "node_modules/get-caller-file": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, -- "license": "ISC", + "license": "ISC", "engines": { - "node": "6.* || 8.* || >= 10.*" +@@ -8921,21 +11096,29 @@ } }, "node_modules/get-intrinsic": { @@ -13164,7 +13194,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -13184,81 +13214,68 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", + "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@hutson/parse-repository-url": "^3.0.0", - "hosted-git-info": "^4.0.0", -@@ -8953,8 +10281,9 @@ +@@ -8953,6 +11136,8 @@ }, "node_modules/get-pkg-repo/node_modules/cliui": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", -@@ -8963,13 +10292,15 @@ +@@ -8963,11 +11148,15 @@ }, "node_modules/get-pkg-repo/node_modules/isarray": { "version": "1.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/get-pkg-repo/node_modules/readable-stream": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", -@@ -8982,21 +10313,24 @@ +@@ -8982,11 +11171,15 @@ }, "node_modules/get-pkg-repo/node_modules/safe-buffer": { "version": "5.1.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/get-pkg-repo/node_modules/string_decoder": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" - } +@@ -8995,6 +11188,8 @@ }, "node_modules/get-pkg-repo/node_modules/through2": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" -@@ -9004,8 +10338,9 @@ +@@ -9004,6 +11199,8 @@ }, "node_modules/get-pkg-repo/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", -@@ -9018,18 +10353,11 @@ +@@ -9018,16 +11215,10 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, @@ -13275,11 +13292,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", -@@ -9043,9 +10371,19 @@ +@@ -9043,8 +11234,20 @@ "node": ">=10" } }, @@ -13288,31 +13303,31 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, ++ "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/get-stdin": { "version": "8.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "license": "MIT", "engines": { "node": ">=10" - }, -@@ -9054,25 +10392,26 @@ +@@ -9054,25 +11257,28 @@ } }, "node_modules/get-stream": { - "version": "5.2.0", -- "license": "MIT", -- "dependencies": { -- "pump": "^3.0.0" -- }, + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "dev": true, + "license": "MIT", +- "dependencies": { +- "pump": "^3.0.0" +- }, "engines": { - "node": ">=8" + "node": ">=16" @@ -13327,7 +13342,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" @@ -13337,7 +13352,7 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -9082,35 +10421,27 @@ +@@ -9082,33 +11288,27 @@ } }, "node_modules/git-raw-commits": { @@ -13346,7 +13361,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz", + "integrity": "sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "dargs": "^7.0.0", - "lodash": "^4.17.15", @@ -13379,66 +13394,108 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", + "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "gitconfiglocal": "^1.0.0", - "pify": "^2.3.0" -@@ -9121,16 +10452,18 @@ +@@ -9121,6 +11321,8 @@ }, "node_modules/git-remote-origin-url/node_modules/pify": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -9129,6 +11331,8 @@ }, "node_modules/git-semver-tags": { "version": "4.1.1", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz", + "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "meow": "^8.0.0", - "semver": "^6.0.0" -@@ -9142,21 +10475,260 @@ +@@ -9142,102 +11346,81 @@ "node": ">=10" } }, +- "node_modules/gitconfiglocal": { +- "version": "1.0.0", + "node_modules/git-semver-tags/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -+ "dev": true, -+ "dependencies": { + "dev": true, +- "license": "BSD", +- "dependencies": { +- "ini": "^1.3.2" +- } +- }, +- "node_modules/github-from-package": { +- "version": "0.0.0", +- "license": "MIT" +- }, +- "node_modules/glob": { +- "version": "7.2.3", +- "license": "ISC", ++ "license": "MIT", + "dependencies": { +- "fs.realpath": "^1.0.0", +- "inflight": "^1.0.4", +- "inherits": "2", +- "minimatch": "^3.1.1", +- "once": "^1.3.0", +- "path-is-absolute": "^1.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": "*" +- }, +- "funding": { +- "url": "https://github.com/sponsors/isaacs" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/glob-parent": { +- "version": "5.1.2", +- "license": "ISC", + "node_modules/git-semver-tags/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, -+ "dependencies": { ++ "license": "MIT", + "dependencies": { +- "is-glob": "^4.0.1" + "p-locate": "^4.1.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 6" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/glob-to-regexp": { +- "version": "0.4.1", +- "license": "BSD-2-Clause" +- }, +- "node_modules/glob/node_modules/brace-expansion": { +- "version": "1.1.11", + "node_modules/git-semver-tags/node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", + "dev": true, -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "node_modules/glob/node_modules/minimatch": { +- "version": "3.1.2", +- "license": "ISC", +- "dependencies": { +- "brace-expansion": "^1.1.7" + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", @@ -13450,132 +13507,228 @@ index a38125e..a1067b0 100644 + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" -+ }, -+ "engines": { + }, + "engines": { +- "node": "*" +- } +- }, +- "node_modules/global-agent": { +- "version": "3.0.0", +- "license": "BSD-3-Clause", +- "optional": true, +- "dependencies": { +- "boolean": "^3.0.1", +- "es6-error": "^4.1.1", +- "matcher": "^3.0.0", +- "roarr": "^2.15.3", +- "semver": "^7.3.2", +- "serialize-error": "^7.0.1" + "node": ">=10" -+ }, + }, +- "engines": { +- "node": ">=10.0" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, + } + }, +- "node_modules/global-agent/node_modules/lru-cache": { +- "version": "6.0.0", +- "license": "ISC", +- "optional": true, + "node_modules/git-semver-tags/node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "dev": true, -+ "dependencies": { ++ "license": "BSD-2-Clause", + "dependencies": { +- "yallist": "^4.0.0" + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, + }, + "engines": { + "node": ">=10" + } + }, +- "node_modules/global-agent/node_modules/semver": { +- "version": "7.5.4", + "node_modules/git-semver-tags/node_modules/normalize-package-data/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, -+ "bin": { -+ "semver": "bin/semver.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, + "license": "ISC", +- "optional": true, +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, + "bin": { + "semver": "bin/semver.js" + }, +@@ -9245,115 +11428,408 @@ + "node": ">=10" + } + }, +- "node_modules/global-agent/node_modules/yallist": { +- "version": "4.0.0", +- "license": "ISC", +- "optional": true +- }, +- "node_modules/global-directory": { +- "version": "4.0.1", + "node_modules/git-semver-tags/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -+ "dev": true, -+ "dependencies": { + "dev": true, + "license": "MIT", + "dependencies": { +- "ini": "4.1.1" + "p-try": "^2.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=18" + "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/global-directory/node_modules/ini": { +- "version": "4.1.1", +- "dev": true, +- "license": "ISC", +- "engines": { +- "node": "^14.17.0 || ^16.13.0 || >=18.0.0" +- } +- }, +- "node_modules/global-modules": { +- "version": "2.0.0", + "node_modules/git-semver-tags/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -+ "dev": true, -+ "dependencies": { + "dev": true, + "license": "MIT", + "dependencies": { +- "global-prefix": "^3.0.0" + "p-limit": "^2.2.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=6" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/global-prefix": { +- "version": "3.0.0", + "node_modules/git-semver-tags/node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", -+ "dev": true, -+ "dependencies": { + "dev": true, + "license": "MIT", + "dependencies": { +- "ini": "^1.3.5", +- "kind-of": "^6.0.2", +- "which": "^1.3.1" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=6" +- } +- }, +- "node_modules/global-prefix/node_modules/which": { +- "version": "1.3.1", +- "dev": true, +- "license": "ISC", +- "dependencies": { +- "isexe": "^2.0.0" + "node": ">=8" -+ }, + }, +- "bin": { +- "which": "bin/which" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, + } + }, +- "node_modules/globals": { +- "version": "11.12.0", + "node_modules/git-semver-tags/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, -+ "engines": { + "license": "MIT", + "engines": { +- "node": ">=4" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/globalthis": { +- "version": "1.0.3", +- "devOptional": true, + "node_modules/git-semver-tags/node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "define-properties": "^1.1.3" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.4" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/globby": { +- "version": "11.1.0", + "node_modules/git-semver-tags/node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", -+ "dev": true, -+ "dependencies": { + "dev": true, + "license": "MIT", + "dependencies": { +- "array-union": "^2.1.0", +- "dir-glob": "^3.0.1", +- "fast-glob": "^3.2.9", +- "ignore": "^5.2.0", +- "merge2": "^1.4.1", +- "slash": "^3.0.0" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=10" + "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/globjoin": { +- "version": "0.1.4", + "node_modules/git-semver-tags/node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", -+ "dev": true, + "dev": true, +- "license": "MIT" ++ "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } @@ -13584,13 +13737,15 @@ index a38125e..a1067b0 100644 + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", -+ "dev": true ++ "dev": true, ++ "license": "ISC" + }, + "node_modules/git-semver-tags/node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, ++ "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", @@ -13603,6 +13758,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, ++ "license": "ISC", + "bin": { + "semver": "bin/semver" + } @@ -13612,6 +13768,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, ++ "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } @@ -13621,6 +13778,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, ++ "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, @@ -13633,319 +13791,316 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, ++ "license": "ISC", + "engines": { + "node": ">=10" + } + }, - "node_modules/gitconfiglocal": { - "version": "1.0.0", ++ "node_modules/gitconfiglocal": { ++ "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", + "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==", - "dev": true, -- "license": "BSD", - "dependencies": { - "ini": "^1.3.2" - } - }, ++ "dev": true, ++ "license": "BSD", ++ "dependencies": { ++ "ini": "^1.3.2" ++ } ++ }, + "node_modules/gitconfiglocal/node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", -+ "dev": true ++ "dev": true, ++ "license": "ISC" + }, - "node_modules/github-from-package": { - "version": "0.0.0", -- "license": "MIT" ++ "node_modules/github-from-package": { ++ "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", -+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" - }, - "node_modules/glob": { - "version": "7.2.3", -- "license": "ISC", ++ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", ++ "license": "MIT" ++ }, ++ "node_modules/glob": { ++ "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", -@@ -9174,7 +10746,8 @@ - }, - "node_modules/glob-parent": { - "version": "5.1.2", -- "license": "ISC", ++ "license": "ISC", ++ "dependencies": { ++ "fs.realpath": "^1.0.0", ++ "inflight": "^1.0.4", ++ "inherits": "2", ++ "minimatch": "^3.1.1", ++ "once": "^1.3.0", ++ "path-is-absolute": "^1.0.0" ++ }, ++ "engines": { ++ "node": "*" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/isaacs" ++ } ++ }, ++ "node_modules/glob-parent": { ++ "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dependencies": { - "is-glob": "^4.0.1" - }, -@@ -9184,11 +10757,13 @@ - }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", -- "license": "BSD-2-Clause" ++ "license": "ISC", ++ "dependencies": { ++ "is-glob": "^4.0.1" ++ }, ++ "engines": { ++ "node": ">= 6" ++ } ++ }, ++ "node_modules/glob-to-regexp": { ++ "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", -+ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", -- "license": "MIT", ++ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", ++ "license": "BSD-2-Clause" ++ }, ++ "node_modules/glob/node_modules/brace-expansion": { ++ "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -@@ -9196,7 +10771,8 @@ - }, - "node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", -- "license": "ISC", ++ "license": "MIT", ++ "dependencies": { ++ "balanced-match": "^1.0.0", ++ "concat-map": "0.0.1" ++ } ++ }, ++ "node_modules/glob/node_modules/minimatch": { ++ "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -9206,7 +10782,8 @@ - }, - "node_modules/global-agent": { - "version": "3.0.0", -- "license": "BSD-3-Clause", ++ "license": "ISC", ++ "dependencies": { ++ "brace-expansion": "^1.1.7" ++ }, ++ "engines": { ++ "node": "*" ++ } ++ }, ++ "node_modules/global-agent": { ++ "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", + "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", -@@ -9214,30 +10791,17 @@ - "matcher": "^3.0.0", - "roarr": "^2.15.3", - "semver": "^7.3.2", -- "serialize-error": "^7.0.1" -- }, -- "engines": { -- "node": ">=10.0" -- } -- }, -- "node_modules/global-agent/node_modules/lru-cache": { -- "version": "6.0.0", -- "license": "ISC", -- "optional": true, -- "dependencies": { -- "yallist": "^4.0.0" ++ "license": "BSD-3-Clause", ++ "optional": true, ++ "dependencies": { ++ "boolean": "^3.0.1", ++ "es6-error": "^4.1.1", ++ "matcher": "^3.0.0", ++ "roarr": "^2.15.3", ++ "semver": "^7.3.2", + "serialize-error": "^7.0.1" - }, - "engines": { -- "node": ">=10" ++ }, ++ "engines": { + "node": ">=10.0" - } - }, - "node_modules/global-agent/node_modules/semver": { -- "version": "7.5.4", -- "license": "ISC", ++ } ++ }, ++ "node_modules/global-agent/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "optional": true, -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, - "bin": { - "semver": "bin/semver.js" - }, -@@ -9245,15 +10809,11 @@ - "node": ">=10" - } - }, -- "node_modules/global-agent/node_modules/yallist": { -- "version": "4.0.0", -- "license": "ISC", -- "optional": true -- }, - "node_modules/global-directory": { - "version": "4.0.1", ++ "license": "ISC", ++ "optional": true, ++ "bin": { ++ "semver": "bin/semver.js" ++ }, ++ "engines": { ++ "node": ">=10" ++ } ++ }, ++ "node_modules/global-directory": { ++ "version": "4.0.1", + "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz", + "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==", - "dev": true, -- "license": "MIT", - "dependencies": { - "ini": "4.1.1" - }, -@@ -9264,18 +10824,11 @@ - "url": "https://github.com/sponsors/sindresorhus" - } - }, -- "node_modules/global-directory/node_modules/ini": { -- "version": "4.1.1", -- "dev": true, -- "license": "ISC", -- "engines": { -- "node": "^14.17.0 || ^16.13.0 || >=18.0.0" -- } -- }, - "node_modules/global-modules": { - "version": "2.0.0", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "ini": "4.1.1" ++ }, ++ "engines": { ++ "node": ">=18" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/global-modules": { ++ "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, -- "license": "MIT", - "dependencies": { - "global-prefix": "^3.0.0" - }, -@@ -9285,8 +10838,9 @@ - }, - "node_modules/global-prefix": { - "version": "3.0.0", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "global-prefix": "^3.0.0" ++ }, ++ "engines": { ++ "node": ">=6" ++ } ++ }, ++ "node_modules/global-prefix": { ++ "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, -- "license": "MIT", - "dependencies": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", -@@ -9296,10 +10850,17 @@ - "node": ">=6" - } - }, ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "ini": "^1.3.5", ++ "kind-of": "^6.0.2", ++ "which": "^1.3.1" ++ }, ++ "engines": { ++ "node": ">=6" ++ } ++ }, + "node_modules/global-prefix/node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", -+ "dev": true ++ "dev": true, ++ "license": "ISC" + }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", ++ "node_modules/global-prefix/node_modules/which": { ++ "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, -- "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, -@@ -9309,17 +10870,20 @@ - }, - "node_modules/globals": { - "version": "11.12.0", -- "license": "MIT", ++ "dev": true, ++ "license": "ISC", ++ "dependencies": { ++ "isexe": "^2.0.0" ++ }, ++ "bin": { ++ "which": "bin/which" ++ } ++ }, ++ "node_modules/globals": { ++ "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/globalthis": { -- "version": "1.0.3", ++ "license": "MIT", ++ "engines": { ++ "node": ">=4" ++ } ++ }, ++ "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "devOptional": true, -- "license": "MIT", - "dependencies": { -- "define-properties": "^1.1.3" ++ "devOptional": true, ++ "license": "MIT", ++ "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" -@@ -9330,8 +10894,9 @@ - }, - "node_modules/globby": { - "version": "11.1.0", ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, ++ "node_modules/globby": { ++ "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, -- "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", -@@ -9349,13 +10914,15 @@ - }, - "node_modules/globjoin": { - "version": "0.1.4", -- "dev": true, -- "license": "MIT" ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "array-union": "^2.1.0", ++ "dir-glob": "^3.0.1", ++ "fast-glob": "^3.2.9", ++ "ignore": "^5.2.0", ++ "merge2": "^1.4.1", ++ "slash": "^3.0.0" ++ }, ++ "engines": { ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } ++ }, ++ "node_modules/globjoin": { ++ "version": "0.1.4", + "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", + "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", -+ "dev": true ++ "dev": true, ++ "license": "MIT" }, "node_modules/gopd": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.3" - }, -@@ -9365,7 +10932,8 @@ +@@ -9365,6 +11841,8 @@ }, "node_modules/got": { "version": "11.8.6", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", + "license": "MIT", "dependencies": { "@sindresorhus/is": "^4.0.0", - "@szmarczak/http-timer": "^4.0.5", -@@ -9388,17 +10956,20 @@ +@@ -9388,15 +11866,21 @@ }, "node_modules/graceful-fs": { "version": "4.2.11", -- "license": "ISC" + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", -+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" ++ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC" }, "node_modules/handle-thing": { "version": "2.0.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/handlebars": { "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", -@@ -9417,50 +10988,56 @@ +@@ -9417,6 +11901,8 @@ }, "node_modules/hard-rejection": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=6" - } +@@ -9425,6 +11911,8 @@ }, "node_modules/has": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4.0" - } +@@ -9433,6 +11921,8 @@ }, "node_modules/has-bigints": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "funding": { - "url": "https://github.com/sponsors/ljharb" - } +@@ -9441,24 +11931,30 @@ }, "node_modules/has-flag": { "version": "4.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -13956,7 +14111,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" @@ -13971,22 +14126,18 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4" - }, -@@ -9470,8 +11047,9 @@ +@@ -9470,6 +11966,8 @@ }, "node_modules/has-symbols": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4" - }, -@@ -9480,11 +11058,12 @@ +@@ -9480,11 +11978,13 @@ } }, "node_modules/has-tostringtag": { @@ -13995,117 +14146,105 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" -@@ -9495,11 +11074,13 @@ +@@ -9495,10 +11995,14 @@ }, "node_modules/hash-sum": { "version": "2.0.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", -+ "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==" ++ "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", + "license": "MIT" }, "node_modules/hasown": { - "version": "2.0.0", -- "license": "MIT", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" - }, -@@ -9509,15 +11090,17 @@ +@@ -9509,6 +12013,8 @@ }, "node_modules/he": { "version": "1.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", "bin": { "he": "bin/he" - } +@@ -9516,6 +12022,8 @@ }, "node_modules/hosted-git-info": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "lru-cache": "^6.0.0" - }, -@@ -9527,8 +11110,9 @@ +@@ -9527,6 +12035,8 @@ }, "node_modules/hosted-git-info/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "yallist": "^4.0.0" - }, -@@ -9538,13 +11122,15 @@ +@@ -9538,11 +12048,15 @@ }, "node_modules/hosted-git-info/node_modules/yallist": { "version": "4.0.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/hpack.js": { "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", -@@ -9554,13 +11140,15 @@ +@@ -9554,11 +12068,15 @@ }, "node_modules/hpack.js/node_modules/isarray": { "version": "1.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/hpack.js/node_modules/readable-stream": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", -@@ -9573,19 +11161,23 @@ +@@ -9573,11 +12091,15 @@ }, "node_modules/hpack.js/node_modules/safe-buffer": { "version": "5.1.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/hpack.js/node_modules/string_decoder": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" +@@ -9585,7 +12107,9 @@ } }, "node_modules/html-entities": { @@ -14116,55 +14255,45 @@ index a38125e..a1067b0 100644 "dev": true, "funding": [ { -@@ -9596,12 +11188,12 @@ - "type": "patreon", - "url": "https://patreon.com/mdevils" - } -- ], -- "license": "MIT" -+ ] +@@ -9601,6 +12125,8 @@ }, "node_modules/html-minifier-terser": { "version": "6.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "license": "MIT", "dependencies": { "camel-case": "^4.1.2", - "clean-css": "^5.2.2", -@@ -9620,15 +11212,17 @@ +@@ -9620,6 +12146,8 @@ }, "node_modules/html-minifier-terser/node_modules/commander": { "version": "8.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "license": "MIT", "engines": { "node": ">= 12" - } +@@ -9627,6 +12155,8 @@ }, "node_modules/html-tags": { "version": "3.3.1", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", + "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - }, -@@ -9637,8 +11231,9 @@ +@@ -9637,7 +12167,9 @@ } }, "node_modules/html-webpack-plugin": { - "version": "5.5.3", -- "license": "MIT", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.4.tgz", + "integrity": "sha512-3wNSaVVxdxcu0jd4FpQFoICdqgxs4zIQQvj+2yQKFfBOnLETQ6X5CDWdeasuGlSsooFlMkEioWDTqBv1wvw5Iw==", + "license": "MIT", "dependencies": { "@types/html-minifier-terser": "^6.0.0", - "html-minifier-terser": "^6.0.2", -@@ -9659,6 +11254,8 @@ +@@ -9659,6 +12191,8 @@ }, "node_modules/htmlparser2": { "version": "8.0.2", @@ -14173,88 +14302,76 @@ index a38125e..a1067b0 100644 "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { -@@ -9666,7 +11263,6 @@ - "url": "https://github.com/sponsors/fb55" - } - ], -- "license": "MIT", - "dependencies": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3", -@@ -9676,17 +11272,20 @@ +@@ -9676,15 +12210,21 @@ }, "node_modules/http-cache-semantics": { "version": "4.1.1", -- "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", -+ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" ++ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "license": "BSD-2-Clause" }, "node_modules/http-deceiver": { "version": "1.2.7", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/http-errors": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", -@@ -9700,13 +11299,15 @@ +@@ -9700,11 +12240,15 @@ }, "node_modules/http-parser-js": { "version": "0.5.8", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/http-proxy": { "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", -@@ -9718,8 +11319,9 @@ +@@ -9718,6 +12262,8 @@ }, "node_modules/http-proxy-agent": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", -@@ -9731,8 +11333,9 @@ +@@ -9730,7 +12276,9 @@ + } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", -+ "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", +- "version": "2.0.6", ++ "version": "2.0.7", ++ "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", ++ "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/http-proxy": "^1.17.8", - "http-proxy": "^1.18.1", -@@ -9752,20 +11355,10 @@ +@@ -9752,23 +12300,14 @@ } } }, - "node_modules/http-proxy-middleware/node_modules/is-plain-obj": { - "version": "3.0.0", - "dev": true, -- "license": "MIT", ++ "node_modules/http2-wrapper": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", ++ "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "license": "MIT", - "engines": { - "node": ">=10" - }, @@ -14262,35 +14379,37 @@ index a38125e..a1067b0 100644 - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/http2-wrapper": { - "version": "1.0.3", +- "node_modules/http2-wrapper": { +- "version": "1.0.3", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", -+ "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.0.0" -@@ -9776,8 +11369,9 @@ +- "dependencies": { +- "quick-lru": "^5.1.1", +- "resolve-alpn": "^1.0.0" ++ "dependencies": { ++ "quick-lru": "^5.1.1", ++ "resolve-alpn": "^1.0.0" + }, + "engines": { + "node": ">=10.19.0" +@@ -9776,6 +12315,8 @@ }, "node_modules/https-proxy-agent": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "agent-base": "6", - "debug": "4" -@@ -9787,16 +11381,19 @@ +@@ -9787,14 +12328,19 @@ } }, "node_modules/human-signals": { - "version": "2.1.0", -- "license": "Apache-2.0", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", + "dev": true, + "license": "Apache-2.0", "engines": { - "node": ">=10.17.0" + "node": ">=16.17.0" @@ -14301,11 +14420,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", + "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "husky": "bin.mjs" - }, -@@ -9807,9 +11404,27 @@ +@@ -9807,8 +12353,28 @@ "url": "https://github.com/sponsors/typicode" } }, @@ -14314,6 +14431,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", + "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==", + "dev": true, ++ "license": "MIT", + "optional": true, + "os": [ + "darwin" @@ -14328,23 +14446,21 @@ index a38125e..a1067b0 100644 + }, "node_modules/iconv-lite": { "version": "0.6.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" - }, -@@ -9819,7 +11434,8 @@ +@@ -9819,6 +12385,8 @@ }, "node_modules/icss-utils": { "version": "5.1.0", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" - }, -@@ -9829,6 +11445,8 @@ +@@ -9829,6 +12397,8 @@ }, "node_modules/ieee754": { "version": "1.2.1", @@ -14353,13 +14469,8 @@ index a38125e..a1067b0 100644 "funding": [ { "type": "github", -@@ -9842,25 +11460,27 @@ - "type": "consulting", - "url": "https://feross.org/support" - } -- ], -- "license": "BSD-3-Clause" -+ ] +@@ -9846,7 +12416,9 @@ + "license": "BSD-3-Clause" }, "node_modules/ignore": { - "version": "5.3.0", @@ -14367,27 +14478,24 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 4" - } +@@ -9855,10 +12427,14 @@ }, "node_modules/immediate": { "version": "3.0.6", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", -+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" ++ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "license": "MIT" }, "node_modules/import-fresh": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" -@@ -9872,17 +11492,28 @@ +@@ -9872,8 +12448,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, @@ -14396,6 +14504,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=4" + } @@ -14405,21 +14514,20 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" +@@ -9881,7 +12469,9 @@ } }, "node_modules/import-local": { - "version": "3.1.0", -- "license": "MIT", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" -@@ -9898,9 +11529,10 @@ +@@ -9898,7 +12488,9 @@ } }, "node_modules/import-meta-resolve": { @@ -14428,48 +14536,43 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", + "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==", "dev": true, -- "license": "MIT", + "license": "MIT", "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" -@@ -9908,23 +11540,27 @@ +@@ -9908,6 +12500,8 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.8.19" - } +@@ -9916,6 +12510,8 @@ }, "node_modules/indent-string": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -9924,6 +12520,9 @@ }, "node_modules/inflight": { "version": "1.0.6", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", "dependencies": { "once": "^1.3.0", - "wrappy": "1" -@@ -9932,16 +11568,23 @@ +@@ -9932,14 +12531,24 @@ }, "node_modules/inherits": { "version": "2.0.4", -- "license": "ISC" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" ++ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" }, "node_modules/ini": { - "version": "1.3.8", @@ -14478,6 +14581,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", + "dev": true, ++ "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } @@ -14487,11 +14591,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", -@@ -9962,11 +11605,12 @@ +@@ -9962,11 +12571,13 @@ } }, "node_modules/internal-slot": { @@ -14500,33 +14602,32 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" }, -@@ -9976,14 +11620,16 @@ +@@ -9976,6 +12587,8 @@ }, "node_modules/interpret": { "version": "2.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "license": "MIT", "engines": { "node": ">= 0.10" - } +@@ -9983,6 +12596,8 @@ }, "node_modules/ip-address": { "version": "5.9.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-5.9.4.tgz", + "integrity": "sha512-dHkI3/YNJq4b/qQaz+c8LuarD3pY24JqZWfjB8aZx1gtpc2MDILu9L9jpZe1sHpzo/yWFweQVn+U//FhazUxmw==", + "license": "MIT", "dependencies": { "jsbn": "1.1.0", - "lodash": "^4.17.15", -@@ -9994,21 +11640,25 @@ +@@ -9994,7 +12609,9 @@ } }, "node_modules/ipaddr.js": { @@ -14535,9 +14636,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz", + "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 10" +@@ -10002,13 +12619,17 @@ } }, "node_modules/is-array-buffer": { @@ -14546,7 +14647,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", @@ -14558,77 +14659,67 @@ index a38125e..a1067b0 100644 }, "funding": { "url": "https://github.com/sponsors/ljharb" -@@ -10016,13 +11666,15 @@ +@@ -10016,11 +12637,15 @@ }, "node_modules/is-arrayish": { "version": "0.2.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-bigint": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-bigints": "^1.0.1" - }, -@@ -10032,7 +11684,8 @@ +@@ -10032,6 +12657,8 @@ }, "node_modules/is-binary-path": { "version": "2.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" - }, -@@ -10042,8 +11695,9 @@ +@@ -10042,6 +12669,8 @@ }, "node_modules/is-boolean-object": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" -@@ -10057,8 +11711,9 @@ +@@ -10057,6 +12686,8 @@ }, "node_modules/is-callable": { "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4" - }, -@@ -10068,8 +11723,9 @@ +@@ -10068,6 +12699,8 @@ }, "node_modules/is-ci": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ci-info": "^3.2.0" - }, -@@ -10078,10 +11734,29 @@ +@@ -10078,10 +12711,31 @@ } }, "node_modules/is-core-module": { - "version": "2.13.1", -- "license": "MIT", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "license": "MIT", "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" @@ -14645,6 +14736,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "is-typed-array": "^1.1.13" + }, @@ -14653,58 +14745,52 @@ index a38125e..a1067b0 100644 }, "funding": { "url": "https://github.com/sponsors/ljharb" -@@ -10089,8 +11764,9 @@ +@@ -10089,6 +12743,8 @@ }, "node_modules/is-date-object": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" - }, -@@ -10103,8 +11779,9 @@ +@@ -10103,6 +12759,8 @@ }, "node_modules/is-docker": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "is-docker": "cli.js" - }, -@@ -10117,22 +11794,25 @@ +@@ -10117,6 +12775,8 @@ }, "node_modules/is-extglob": { "version": "2.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -10124,6 +12784,8 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -10132,6 +12794,8 @@ }, "node_modules/is-glob": { "version": "4.0.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" - }, -@@ -10141,9 +11821,10 @@ +@@ -10141,7 +12805,9 @@ } }, "node_modules/is-negative-zero": { @@ -14713,37 +14799,33 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4" - }, -@@ -10153,15 +11834,17 @@ +@@ -10153,6 +12819,8 @@ }, "node_modules/is-number": { "version": "7.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", "engines": { "node": ">=0.12.0" - } +@@ -10160,6 +12828,8 @@ }, "node_modules/is-number-object": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" - }, -@@ -10174,35 +11857,43 @@ +@@ -10174,21 +12844,30 @@ }, "node_modules/is-obj": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "license": "MIT", "engines": { "node": ">=8" } @@ -14754,7 +14836,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" + "node": ">=10" @@ -14768,27 +14850,24 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -10197,10 +12876,14 @@ }, "node_modules/is-property": { "version": "1.0.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", -+ "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==" ++ "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", + "license": "MIT" }, "node_modules/is-regex": { "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" -@@ -10215,21 +11906,27 @@ +@@ -10215,21 +12898,29 @@ } }, "node_modules/is-shared-array-buffer": { @@ -14797,7 +14876,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" @@ -14811,40 +14890,36 @@ index a38125e..a1067b0 100644 }, "node_modules/is-stream": { - "version": "2.0.1", -- "license": "MIT", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" -@@ -10237,8 +11934,9 @@ +@@ -10237,6 +12928,8 @@ }, "node_modules/is-string": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" - }, -@@ -10251,8 +11949,9 @@ +@@ -10251,6 +12944,8 @@ }, "node_modules/is-symbol": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-symbols": "^1.0.2" - }, -@@ -10264,22 +11963,24 @@ +@@ -10264,22 +12959,26 @@ } }, "node_modules/is-text-path": { @@ -14853,7 +14928,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz", + "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "text-extensions": "^1.0.0" + "text-extensions": "^2.0.0" @@ -14869,67 +14944,61 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" -@@ -10290,8 +11991,9 @@ +@@ -10290,6 +12989,8 @@ }, "node_modules/is-weakref": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2" - }, -@@ -10301,8 +12003,9 @@ +@@ -10301,6 +13002,8 @@ }, "node_modules/is-wsl": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "is-docker": "^2.0.0" - }, -@@ -10312,13 +12015,15 @@ +@@ -10312,11 +13015,15 @@ }, "node_modules/isarray": { "version": "2.0.5", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/isbinaryfile": { - "version": "5.0.2", -+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.2.tgz", -+ "integrity": "sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg==", +- "version": "5.0.2", ++ "version": "5.0.3", ++ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.3.tgz", ++ "integrity": "sha512-VR4gNjFaDP8csJQvzInG20JvBj8MaHYLxNOMXysxRbGM7tcsHZwCjhch3FubFtZBkuDbN55i4dUukGeIrzF+6g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 18.0.0" - }, -@@ -10328,25 +12033,25 @@ +@@ -10328,25 +13035,28 @@ }, "node_modules/isexe": { "version": "2.0.0", -- "license": "ISC" + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" ++ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" }, "node_modules/isobject": { "version": "3.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14940,7 +15009,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, -- "license": "BlueOak-1.0.0", + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -14950,7 +15019,7 @@ index a38125e..a1067b0 100644 "funding": { "url": "https://github.com/sponsors/isaacs" }, -@@ -10355,9 +12060,10 @@ +@@ -10355,7 +13065,9 @@ } }, "node_modules/jake": { @@ -14959,53 +15028,45 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "async": "^3.2.3", - "chalk": "^4.0.2", -@@ -10373,8 +12079,9 @@ +@@ -10373,6 +13085,8 @@ }, "node_modules/jake/node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" -@@ -10382,8 +12089,9 @@ +@@ -10382,6 +13096,8 @@ }, "node_modules/jake/node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" - }, -@@ -10393,7 +12101,8 @@ +@@ -10393,6 +13109,8 @@ }, "node_modules/jest-worker": { "version": "27.5.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "license": "MIT", "dependencies": { "@types/node": "*", - "merge-stream": "^2.0.0", -@@ -10405,7 +12114,8 @@ +@@ -10405,6 +13123,8 @@ }, "node_modules/jest-worker/node_modules/supports-color": { "version": "8.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" - }, -@@ -10417,20 +12127,23 @@ +@@ -10417,7 +13137,9 @@ } }, "node_modules/jiti": { @@ -15014,128 +15075,124 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", + "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "jiti": "bin/jiti.js" - } +@@ -10426,10 +13148,14 @@ }, "node_modules/js-tokens": { "version": "4.0.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", -+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" ++ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" }, "node_modules/js-yaml": { "version": "4.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" - }, -@@ -10440,11 +12153,13 @@ +@@ -10440,24 +13166,32 @@ }, "node_modules/jsbn": { "version": "1.1.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", -+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" ++ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "license": "MIT" }, "node_modules/jsesc": { - "version": "2.5.2", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", -+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", +- "version": "2.5.2", ++ "version": "3.0.2", ++ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", ++ "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, -@@ -10454,12 +12169,14 @@ + "engines": { +- "node": ">=4" ++ "node": ">=6" + } }, "node_modules/json-buffer": { "version": "3.0.1", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", -+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" ++ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "license": "MIT" }, "node_modules/json-fixer": { "version": "1.6.15", + "resolved": "https://registry.npmjs.org/json-fixer/-/json-fixer-1.6.15.tgz", + "integrity": "sha512-TuDuZ5KrgyjoCIppdPXBMqiGfota55+odM+j2cQ5rt/XKyKmqGB3Whz1F8SN8+60yYGy/Nu5lbRZ+rx8kBIvBw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/runtime": "^7.18.9", - "chalk": "^4.1.2", -@@ -10471,38 +12188,46 @@ +@@ -10471,37 +13205,53 @@ }, "node_modules/json-parse-better-errors": { "version": "1.0.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", -+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" ++ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" }, "node_modules/json-schema-traverse": { - "version": "0.4.1", -- "license": "MIT" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", -+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" ++ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "license": "MIT" }, "node_modules/json-schema-typed": { "version": "7.0.3", -- "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz", -+ "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==" ++ "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==", + "license": "BSD-2-Clause" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stringify-safe": { "version": "5.0.1", -- "devOptional": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", -+ "devOptional": true + "devOptional": true, + "license": "ISC" }, "node_modules/json2php": { - "version": "0.0.7", -- "license": "BSD" + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.9.tgz", -+ "integrity": "sha512-fQMYwvPsQt8hxRnCGyg1r2JVi6yL8Um0DIIawiKiMK9yhAAkcRNj5UsBWoaFvFzPpcWbgw9L6wzj+UMYA702Mw==" ++ "integrity": "sha512-fQMYwvPsQt8hxRnCGyg1r2JVi6yL8Um0DIIawiKiMK9yhAAkcRNj5UsBWoaFvFzPpcWbgw9L6wzj+UMYA702Mw==", + "license": "BSD" }, "node_modules/json5": { "version": "2.2.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "license": "MIT", "bin": { "json5": "lib/cli.js" - }, -@@ -10512,23 +12237,26 @@ +@@ -10512,6 +13262,8 @@ }, "node_modules/jsonfile": { "version": "4.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "license": "MIT", "optionalDependencies": { "graceful-fs": "^4.1.6" - } +@@ -10519,6 +13271,8 @@ }, "node_modules/jsonparse": { "version": "1.3.1", @@ -15144,120 +15201,111 @@ index a38125e..a1067b0 100644 "dev": true, "engines": [ "node >= 0.2.0" -- ], -- "license": "MIT" -+ ] +@@ -10527,6 +13281,8 @@ }, "node_modules/JSONStream": { "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, -- "license": "(MIT OR Apache-2.0)", + "license": "(MIT OR Apache-2.0)", "dependencies": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" -@@ -10542,7 +12270,8 @@ +@@ -10542,6 +13298,8 @@ }, "node_modules/jszip": { "version": "3.10.1", -- "license": "(MIT OR GPL-3.0-or-later)", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "license": "(MIT OR GPL-3.0-or-later)", "dependencies": { "lie": "~3.3.0", - "pako": "~1.0.2", -@@ -10552,11 +12281,13 @@ +@@ -10552,10 +13310,14 @@ }, "node_modules/jszip/node_modules/isarray": { "version": "1.0.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" ++ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" }, "node_modules/jszip/node_modules/readable-stream": { "version": "2.3.8", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", - "inherits": "~2.0.3", -@@ -10569,49 +12300,57 @@ +@@ -10569,10 +13331,14 @@ }, "node_modules/jszip/node_modules/safe-buffer": { "version": "5.1.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" ++ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" }, "node_modules/jszip/node_modules/string_decoder": { "version": "1.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" - } +@@ -10580,6 +13346,8 @@ }, "node_modules/keyv": { "version": "4.5.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" - } +@@ -10587,6 +13355,8 @@ }, "node_modules/kind-of": { "version": "6.0.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -10594,6 +13364,8 @@ }, "node_modules/klona": { "version": "2.0.6", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", + "license": "MIT", "engines": { "node": ">= 8" - } +@@ -10601,15 +13373,21 @@ }, "node_modules/known-css-properties": { "version": "0.29.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lazy-val": { "version": "1.0.5", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", -+ "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==" ++ "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", + "license": "MIT" }, "node_modules/lazystream": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "readable-stream": "^2.0.5" -@@ -10622,14 +12361,16 @@ +@@ -10622,12 +13400,16 @@ }, "node_modules/lazystream/node_modules/isarray": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true }, "node_modules/lazystream/node_modules/readable-stream": { @@ -15265,18 +15313,16 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "core-util-is": "~1.0.0", -@@ -10643,14 +12384,16 @@ +@@ -10643,12 +13425,16 @@ }, "node_modules/lazystream/node_modules/safe-buffer": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true }, "node_modules/lazystream/node_modules/string_decoder": { @@ -15284,85 +15330,76 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true, - "dependencies": { - "safe-buffer": "~5.1.0" -@@ -10658,12 +12401,14 @@ +@@ -10658,10 +13444,14 @@ }, "node_modules/leaflet": { "version": "1.7.1", -- "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", -+ "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==" ++ "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==", + "license": "BSD-2-Clause" }, "node_modules/levn": { "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" -@@ -10674,20 +12419,23 @@ +@@ -10674,6 +13464,8 @@ }, "node_modules/lie": { "version": "3.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "license": "MIT", "dependencies": { "immediate": "~3.0.5" - } +@@ -10681,11 +13473,15 @@ }, "node_modules/lines-and-columns": { "version": "1.2.4", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/load-json-file": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", -@@ -10700,22 +12448,25 @@ +@@ -10700,6 +13496,8 @@ }, "node_modules/load-json-file/node_modules/pify": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" - } +@@ -10708,6 +13506,8 @@ }, "node_modules/loader-runner": { "version": "4.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "license": "MIT", "engines": { "node": ">=6.11.5" - } +@@ -10715,6 +13515,8 @@ }, "node_modules/loader-utils": { "version": "2.0.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "license": "MIT", "dependencies": { "big.js": "^5.2.2", - "emojis-list": "^3.0.0", -@@ -10726,116 +12477,139 @@ +@@ -10726,115 +13528,159 @@ } }, "node_modules/locate-path": { @@ -15371,7 +15408,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" @@ -15387,32 +15424,30 @@ index a38125e..a1067b0 100644 }, "node_modules/lodash": { "version": "4.17.21", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", -+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" ++ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" }, "node_modules/lodash.camelcase": { "version": "4.3.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.debounce": { "version": "4.0.8", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.defaults": { "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true }, "node_modules/lodash.difference": { @@ -15420,315 +15455,298 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true }, "node_modules/lodash.escaperegexp": { "version": "4.1.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", -+ "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==" ++ "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==", + "license": "MIT" }, "node_modules/lodash.flatten": { "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true }, "node_modules/lodash.isequal": { "version": "4.5.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", -+ "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" ++ "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "license": "MIT" }, "node_modules/lodash.ismatch": { "version": "4.4.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", + "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isplainobject": { "version": "4.0.6", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.kebabcase": { "version": "4.1.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", + "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.mergewith": { "version": "4.6.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.snakecase": { "version": "4.1.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.startcase": { "version": "4.4.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz", + "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.truncate": { "version": "4.4.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.union": { "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", "dev": true, -- "license": "MIT", + "license": "MIT", "peer": true }, "node_modules/lodash.uniq": { "version": "4.5.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.upperfirst": { "version": "4.3.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz", + "integrity": "sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/log-update": { "version": "2.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", + "integrity": "sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==", + "license": "MIT", "dependencies": { "ansi-escapes": "^3.0.0", - "cli-cursor": "^2.0.0", -@@ -10847,14 +12621,16 @@ +@@ -10847,6 +13693,8 @@ }, "node_modules/log-update/node_modules/ansi-escapes": { "version": "3.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "license": "MIT", "engines": { "node": ">=4" - } +@@ -10854,6 +13702,8 @@ }, "node_modules/log-update/node_modules/cli-cursor": { "version": "2.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==", + "license": "MIT", "dependencies": { "restore-cursor": "^2.0.0" - }, -@@ -10864,14 +12640,16 @@ +@@ -10864,6 +13714,8 @@ }, "node_modules/log-update/node_modules/mimic-fn": { "version": "1.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "license": "MIT", "engines": { "node": ">=4" - } +@@ -10871,6 +13723,8 @@ }, "node_modules/log-update/node_modules/onetime": { "version": "2.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==", + "license": "MIT", "dependencies": { "mimic-fn": "^1.0.0" - }, -@@ -10881,7 +12659,8 @@ +@@ -10881,6 +13735,8 @@ }, "node_modules/log-update/node_modules/restore-cursor": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==", + "license": "MIT", "dependencies": { "onetime": "^2.0.0", - "signal-exit": "^3.0.2" -@@ -10890,41 +12669,52 @@ +@@ -10890,12 +13746,22 @@ "node": ">=4" } }, + "node_modules/log-update/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" ++ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", ++ "license": "ISC" + }, "node_modules/long": { "version": "5.2.3", -- "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", -+ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" ++ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==", + "license": "Apache-2.0" }, "node_modules/lower-case": { "version": "2.0.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "license": "MIT", "dependencies": { "tslib": "^2.0.3" - } +@@ -10903,6 +13769,8 @@ }, "node_modules/lowercase-keys": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "license": "MIT", "engines": { "node": ">=8" - } +@@ -10910,6 +13778,8 @@ }, "node_modules/lru-cache": { "version": "5.1.1", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "license": "ISC", "dependencies": { "yallist": "^3.0.2" - } +@@ -10917,6 +13787,8 @@ }, "node_modules/magic-string": { "version": "0.25.9", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "license": "MIT", "dependencies": { "sourcemap-codec": "^1.4.8" - } +@@ -10924,6 +13796,8 @@ }, "node_modules/make-dir": { "version": "3.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "license": "MIT", "dependencies": { "semver": "^6.0.0" - }, -@@ -10937,13 +12727,15 @@ +@@ -10937,11 +13811,15 @@ }, "node_modules/make-error": { "version": "1.3.6", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/map-obj": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - }, -@@ -10952,8 +12744,9 @@ +@@ -10952,7 +13830,9 @@ } }, "node_modules/marked": { - "version": "12.0.0", -- "license": "MIT", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz", + "integrity": "sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==", + "license": "MIT", "bin": { "marked": "bin/marked.js" - }, -@@ -10961,310 +12754,102 @@ - "node": ">= 18" +@@ -10963,6 +13843,8 @@ + }, + "node_modules/matcher": { + "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", ++ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", + "license": "MIT", + "optional": true, + "dependencies": { +@@ -10974,6 +13856,8 @@ + }, + "node_modules/mathml-tag-names": { + "version": "2.1.3", ++ "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", ++ "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "dev": true, + "license": "MIT", + "funding": { +@@ -10983,11 +13867,15 @@ + }, + "node_modules/mdn-data": { + "version": "2.0.30", ++ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", ++ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/media-typer": { + "version": "0.3.0", ++ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", ++ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -10996,6 +13884,8 @@ + }, + "node_modules/memfs": { + "version": "3.5.3", ++ "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", ++ "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", + "dev": true, + "license": "Unlicense", + "dependencies": { +@@ -11006,326 +13896,136 @@ } }, -- "node_modules/matcher": { -- "version": "3.0.0", -- "license": "MIT", -- "optional": true, -- "dependencies": { -- "escape-string-regexp": "^4.0.0" -- }, -- "engines": { -- "node": ">=10" -- } -- }, -- "node_modules/mathml-tag-names": { -- "version": "2.1.3", -- "dev": true, -- "license": "MIT", -- "funding": { -- "type": "github", -- "url": "https://github.com/sponsors/wooorm" -- } -- }, -- "node_modules/mdn-data": { -- "version": "2.0.30", -- "dev": true, -- "license": "CC0-1.0" -- }, -- "node_modules/media-typer": { -- "version": "0.3.0", -- "dev": true, -- "license": "MIT", -- "engines": { -- "node": ">= 0.6" -- } -- }, -- "node_modules/memfs": { -- "version": "3.5.3", -- "dev": true, -- "license": "Unlicense", -- "dependencies": { -- "fs-monkey": "^1.0.4" -- }, -- "engines": { -- "node": ">= 4.0.0" -- } -- }, -- "node_modules/meow": { + "node_modules/meow": { - "version": "8.1.2", -- "dev": true, -- "license": "MIT", ++ "version": "12.1.1", ++ "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", ++ "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==", + "dev": true, + "license": "MIT", - "dependencies": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", @@ -15742,138 +15760,208 @@ index a38125e..a1067b0 100644 - "type-fest": "^0.18.0", - "yargs-parser": "^20.2.3" - }, -- "engines": { + "engines": { - "node": ">=10" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "node": ">=16.10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, - "node_modules/meow/node_modules/find-up": { - "version": "4.1.0", -- "dev": true, -- "license": "MIT", ++ "node_modules/merge-descriptors": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", ++ "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" -- } -- }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, - "node_modules/meow/node_modules/locate-path": { - "version": "5.0.0", -- "dev": true, -- "license": "MIT", ++ "node_modules/merge-stream": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", ++ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", ++ "license": "MIT" ++ }, ++ "node_modules/merge2": { ++ "version": "1.4.1", ++ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", ++ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", - "dependencies": { - "p-locate": "^4.1.0" - }, -- "engines": { + "engines": { - "node": ">=8" -- } -- }, ++ "node": ">= 8" + } + }, - "node_modules/meow/node_modules/lru-cache": { - "version": "6.0.0", -- "dev": true, ++ "node_modules/methods": { ++ "version": "1.1.2", ++ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", ++ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, -- "engines": { ++ "license": "MIT", + "engines": { - "node": ">=10" -- } -- }, ++ "node": ">= 0.6" + } + }, - "node_modules/meow/node_modules/normalize-package-data": { - "version": "3.0.3", - "dev": true, - "license": "BSD-2-Clause", -- "dependencies": { ++ "node_modules/micromatch": { ++ "version": "4.0.8", ++ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", ++ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", ++ "license": "MIT", + "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" -- }, -- "engines": { ++ "braces": "^3.0.3", ++ "picomatch": "^2.3.1" + }, + "engines": { - "node": ">=10" -- } -- }, ++ "node": ">=8.6" + } + }, - "node_modules/meow/node_modules/p-limit": { - "version": "2.3.0", -- "dev": true, -- "license": "MIT", ++ "node_modules/mime": { ++ "version": "2.6.0", ++ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", ++ "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, + "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" -- }, -- "engines": { ++ "bin": { ++ "mime": "cli.js" + }, + "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, ++ "node": ">=4.0.0" + } + }, - "node_modules/meow/node_modules/p-locate": { - "version": "4.1.0", - "dev": true, -- "license": "MIT", ++ "node_modules/mime-db": { ++ "version": "1.52.0", ++ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", ++ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", - "dependencies": { - "p-limit": "^2.2.0" - }, -- "engines": { + "engines": { - "node": ">=8" -- } -- }, ++ "node": ">= 0.6" + } + }, - "node_modules/meow/node_modules/p-try": { - "version": "2.2.0", - "dev": true, -- "license": "MIT", -- "engines": { ++ "node_modules/mime-types": { ++ "version": "2.1.35", ++ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", ++ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", ++ "dependencies": { ++ "mime-db": "1.52.0" ++ }, + "engines": { - "node": ">=6" -- } -- }, ++ "node": ">= 0.6" + } + }, - "node_modules/meow/node_modules/parse-json": { - "version": "5.2.0", - "dev": true, -- "license": "MIT", ++ "node_modules/mimic-fn": { ++ "version": "3.1.0", ++ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", ++ "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", + "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, -- "engines": { -- "node": ">=8" + "engines": { + "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -- }, + } + }, - "node_modules/meow/node_modules/path-exists": { - "version": "4.0.0", - "dev": true, -- "license": "MIT", -- "engines": { ++ "node_modules/mimic-response": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", ++ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "license": "MIT", + "engines": { - "node": ">=8" -- } -- }, ++ "node": ">=4" + } + }, - "node_modules/meow/node_modules/read-pkg": { - "version": "5.2.0", -- "dev": true, -- "license": "MIT", ++ "node_modules/min-indent": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", ++ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "license": "MIT", - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, -- "engines": { + "engines": { - "node": ">=8" -- } -- }, ++ "node": ">=4" + } + }, - "node_modules/meow/node_modules/read-pkg-up": { - "version": "7.0.1", - "dev": true, -- "license": "MIT", -- "dependencies": { ++ "node_modules/mini-css-extract-plugin": { ++ "version": "2.4.7", ++ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.7.tgz", ++ "integrity": "sha512-euWmddf0sk9Nv1O0gfeeUAvAkoSlWncNLF77C0TP2+WoPvy8mAHKOzMajcCz2dzvyt3CNgxb1obIEVFIRxaipg==", + "license": "MIT", + "dependencies": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" @@ -15902,212 +15990,155 @@ index a38125e..a1067b0 100644 - "version": "2.5.0", - "dev": true, - "license": "BSD-2-Clause", -+ "node_modules/matcher": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", -+ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", -+ "optional": true, - "dependencies": { +- "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" -+ "escape-string-regexp": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" - } - }, +- } +- }, - "node_modules/meow/node_modules/read-pkg/node_modules/semver": { - "version": "5.7.2", -+ "node_modules/mathml-tag-names": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", -+ "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", - "dev": true, +- "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/wooorm" - } - }, +- } +- }, - "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { - "version": "0.6.0", -+ "node_modules/mdn-data": { -+ "version": "2.0.30", -+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", -+ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", -+ "dev": true -+ }, -+ "node_modules/media-typer": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", -+ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true, +- "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { +- "engines": { - "node": ">=8" -+ "node": ">= 0.6" - } - }, +- } +- }, - "node_modules/meow/node_modules/semver": { - "version": "7.5.4", -+ "node_modules/memfs": { -+ "version": "3.5.3", -+ "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", -+ "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", - "dev": true, +- "dev": true, - "license": "ISC", - "dependencies": { +- "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" -+ "fs-monkey": "^1.0.4" - }, - "engines": { +- }, +- "engines": { - "node": ">=10" -+ "node": ">= 4.0.0" - } - }, +- } +- }, - "node_modules/meow/node_modules/type-fest": { - "version": "0.18.1", -+ "node_modules/meow": { -+ "version": "12.1.1", -+ "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", -+ "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==", - "dev": true, +- "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { +- "engines": { - "node": ">=10" -+ "node": ">=16.10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, - "node_modules/meow/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", +- "node_modules/merge-descriptors": { +- "version": "1.0.1", - "dev": true, - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", -+ "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", -+ "dev": true - }, - "node_modules/merge-stream": { - "version": "2.0.0", +- }, +- "node_modules/merge-stream": { +- "version": "2.0.0", - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", -+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "node_modules/merge2": { - "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", -+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, +- }, +- "node_modules/merge2": { +- "version": "1.4.1", +- "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/methods": { - "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", -+ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true, +- "engines": { +- "node": ">= 8" +- } +- }, +- "node_modules/methods": { +- "version": "1.1.2", +- "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/micromatch": { +- "engines": { +- "node": ">= 0.6" +- } +- }, +- "node_modules/micromatch": { - "version": "4.0.5", - "license": "MIT", -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", -+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dependencies": { +- "dependencies": { - "braces": "^3.0.2", -+ "braces": "^3.0.3", - "picomatch": "^2.3.1" +- "picomatch": "^2.3.1" +- }, +- "engines": { +- "node": ">=8.6" +- } +- }, +- "node_modules/mime": { +- "version": "2.6.0", +- "dev": true, +- "license": "MIT", +- "bin": { +- "mime": "cli.js" +- }, +- "engines": { +- "node": ">=4.0.0" +- } +- }, +- "node_modules/mime-db": { +- "version": "1.52.0", +- "license": "MIT", +- "engines": { +- "node": ">= 0.6" +- } +- }, +- "node_modules/mime-types": { +- "version": "2.1.35", +- "license": "MIT", +- "dependencies": { +- "mime-db": "1.52.0" +- }, +- "engines": { +- "node": ">= 0.6" +- } +- }, +- "node_modules/mimic-fn": { +- "version": "3.1.0", +- "license": "MIT", +- "engines": { +- "node": ">=8" +- } +- }, +- "node_modules/mimic-response": { +- "version": "1.0.1", +- "license": "MIT", +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/min-indent": { +- "version": "1.0.1", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/mini-css-extract-plugin": { +- "version": "2.4.7", +- "license": "MIT", +- "dependencies": { +- "schema-utils": "^4.0.0" ++ "schema-utils": "^4.0.0" }, "engines": { -@@ -11273,8 +12858,9 @@ - }, - "node_modules/mime": { - "version": "2.6.0", -+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", -+ "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, -- "license": "MIT", - "bin": { - "mime": "cli.js" - }, -@@ -11284,14 +12870,16 @@ - }, - "node_modules/mime-db": { - "version": "1.52.0", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", -+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", -+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, -@@ -11301,29 +12889,33 @@ - }, - "node_modules/mimic-fn": { - "version": "3.1.0", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", -+ "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/mimic-response": { - "version": "1.0.1", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", -+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", -+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, -- "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/mini-css-extract-plugin": { - "version": "2.4.7", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.7.tgz", -+ "integrity": "sha512-euWmddf0sk9Nv1O0gfeeUAvAkoSlWncNLF77C0TP2+WoPvy8mAHKOzMajcCz2dzvyt3CNgxb1obIEVFIRxaipg==", - "dependencies": { - "schema-utils": "^4.0.0" - }, -@@ -11338,37 +12930,10 @@ + "node": ">= 12.13.0" +@@ -11338,36 +14038,10 @@ "webpack": "^5.0.0" } }, @@ -16141,52 +16172,46 @@ index a38125e..a1067b0 100644 - }, "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { "version": "4.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.9.0", -@@ -11385,13 +12950,15 @@ +@@ -11385,11 +14059,15 @@ }, "node_modules/minimalistic-assert": { "version": "1.0.1", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/minimatch": { "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" - }, -@@ -11401,15 +12968,17 @@ +@@ -11401,6 +14079,8 @@ }, "node_modules/minimist": { "version": "1.2.8", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" - } +@@ -11408,6 +14088,8 @@ }, "node_modules/minimist-options": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", -@@ -11419,18 +12988,29 @@ +@@ -11419,8 +14101,20 @@ "node": ">= 6" } }, @@ -16195,6 +16220,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=0.10.0" + } @@ -16204,106 +16230,96 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, -- "license": "ISC", + "license": "ISC", "engines": { - "node": ">=8" - } +@@ -11429,6 +14123,8 @@ }, "node_modules/minizlib": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" -@@ -11441,8 +13021,9 @@ +@@ -11441,6 +14137,8 @@ }, "node_modules/minizlib/node_modules/minipass": { "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "yallist": "^4.0.0" - }, -@@ -11452,12 +13033,14 @@ +@@ -11452,11 +14150,15 @@ }, "node_modules/minizlib/node_modules/yallist": { "version": "4.0.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/mkdirp": { "version": "0.5.6", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "license": "MIT", "dependencies": { "minimist": "^1.2.6" - }, -@@ -11467,35 +13050,41 @@ +@@ -11467,10 +14169,14 @@ }, "node_modules/mkdirp-classic": { "version": "0.5.3", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", -+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" ++ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" }, "node_modules/modify-values": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", + "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -11479,6 +14185,8 @@ }, "node_modules/moment": { "version": "2.30.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "license": "MIT", "engines": { "node": "*" - } +@@ -11486,14 +14194,20 @@ }, "node_modules/moo": { "version": "0.5.2", -- "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", -+ "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==" ++ "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==", + "license": "BSD-3-Clause" }, "node_modules/ms": { - "version": "2.1.2", -- "license": "MIT" -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" +- "version": "2.1.2", ++ "version": "2.1.3", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", ++ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/multicast-dns": { "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "dns-packet": "^5.2.2", - "thunky": "^1.0.2" -@@ -11506,13 +13095,14 @@ +@@ -11506,13 +14220,16 @@ }, "node_modules/mute-stream": { "version": "0.0.8", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/mysql2": { - "version": "3.9.7", @@ -16312,45 +16328,45 @@ index a38125e..a1067b0 100644 + "version": "3.9.9", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.9.tgz", + "integrity": "sha512-Qtb2RUxwWMFkWXqF7Rd/7ySkupbQnNY7O0zQuQYgPcuJZ06M36JG3HIDEh/pEeq7LImcvA6O3lOVQ9XQK+HEZg==", ++ "license": "MIT", "dependencies": { "denque": "^2.1.0", "generate-function": "^2.3.1", -@@ -11529,14 +13119,16 @@ +@@ -11529,6 +14246,8 @@ }, "node_modules/mysql2/node_modules/lru-cache": { "version": "8.0.5", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-8.0.5.tgz", + "integrity": "sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==", + "license": "ISC", "engines": { "node": ">=16.14" - } +@@ -11536,6 +14255,8 @@ }, "node_modules/named-placeholders": { "version": "1.1.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz", + "integrity": "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==", + "license": "MIT", "dependencies": { "lru-cache": "^7.14.1" - }, -@@ -11546,24 +13138,27 @@ +@@ -11546,17 +14267,23 @@ }, "node_modules/named-placeholders/node_modules/lru-cache": { "version": "7.18.3", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/nan": { - "version": "2.19.0", -- "license": "MIT" -+ "version": "2.20.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", -+ "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==" ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT" }, "node_modules/nanoid": { "version": "3.3.7", @@ -16359,81 +16375,70 @@ index a38125e..a1067b0 100644 "funding": [ { "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], -- "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, -@@ -11573,16 +13168,19 @@ +@@ -11573,15 +14300,21 @@ }, "node_modules/napi-build-utils": { "version": "1.0.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", -+ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==" ++ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "license": "MIT" }, "node_modules/natural-compare": { "version": "1.4.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nearley": { "version": "2.20.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", + "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==", + "license": "MIT", "dependencies": { "commander": "^2.19.0", - "moo": "^0.5.0", -@@ -11602,31 +13200,36 @@ +@@ -11602,10 +14335,14 @@ }, "node_modules/nearley/node_modules/commander": { "version": "2.20.3", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", -+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" ++ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" - } +@@ -11614,10 +14351,14 @@ }, "node_modules/neo-async": { "version": "2.6.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", -+ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" ++ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "license": "MIT" }, "node_modules/no-case": { "version": "3.0.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "license": "MIT", "dependencies": { "lower-case": "^2.0.2", - "tslib": "^2.0.3" +@@ -11625,7 +14366,9 @@ } }, "node_modules/node-abi": { - "version": "3.51.0", -- "license": "MIT", -+ "version": "3.67.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.67.0.tgz", -+ "integrity": "sha512-bLn/fU/ALVBE9wj+p4Y21ZJWYFjUXLXPi/IewyLZkx3ApxKDNBWCKdReeKOtD8dWpOdDCeMyLh6ZewzcLsG2Nw==", ++ "version": "3.71.0", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", ++ "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", + "license": "MIT", "dependencies": { "semver": "^7.3.5" - }, -@@ -11634,22 +13237,10 @@ +@@ -11634,22 +14377,11 @@ "node": ">=10" } }, @@ -16449,17 +16454,17 @@ index a38125e..a1067b0 100644 - }, "node_modules/node-abi/node_modules/semver": { - "version": "7.5.4", -- "license": "ISC", -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, "bin": { "semver": "bin/semver.js" }, -@@ -11657,14 +13248,18 @@ +@@ -11657,12 +14389,18 @@ "node": ">=10" } }, @@ -16471,6 +16476,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", + "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", + "dev": true, ++ "license": "MIT", + "optional": true }, "node_modules/node-fetch": { @@ -16478,11 +16484,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "whatwg-url": "^5.0.0" - }, -@@ -11681,9 +13276,9 @@ +@@ -11681,9 +14419,10 @@ } }, "node_modules/node-firebird": { @@ -16492,95 +16496,89 @@ index a38125e..a1067b0 100644 + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/node-firebird/-/node-firebird-1.1.9.tgz", + "integrity": "sha512-6Ol+Koide1WbfUp4BJ1dSA4wm091jAgCwwSoihxO/RRdcfR+dMVDE9jd2Z2ixjk7q/vSNJUYORXv7jmRfvwdrw==", ++ "license": "MPL-2.0", "dependencies": { "big-integer": "^1.6.51", "long": "^5.2.3" -@@ -11691,15 +13286,17 @@ +@@ -11691,6 +14430,8 @@ }, "node_modules/node-forge": { "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", "dev": true, -- "license": "(BSD-3-Clause OR GPL-2.0)", + "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { - "node": ">= 6.13.0" - } +@@ -11699,6 +14440,8 @@ }, "node_modules/node-loader": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/node-loader/-/node-loader-2.0.0.tgz", + "integrity": "sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q==", + "license": "MIT", "dependencies": { "loader-utils": "^2.0.0" - }, -@@ -11715,13 +13312,15 @@ +@@ -11715,11 +14458,15 @@ } }, "node_modules/node-releases": { - "version": "2.0.13", -- "license": "MIT" + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", -+ "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==" ++ "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "license": "MIT" }, "node_modules/normalize-package-data": { "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", -@@ -11731,27 +13330,31 @@ +@@ -11731,11 +14478,15 @@ }, "node_modules/normalize-package-data/node_modules/hosted-git-info": { "version": "2.8.9", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/normalize-package-data/node_modules/semver": { "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, -- "license": "ISC", + "license": "ISC", "bin": { - "semver": "bin/semver" - } +@@ -11744,6 +14495,8 @@ }, "node_modules/normalize-path": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -11751,6 +14504,8 @@ }, "node_modules/normalize-url": { "version": "6.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "license": "MIT", "engines": { "node": ">=10" - }, -@@ -11760,18 +13363,36 @@ +@@ -11760,17 +14515,38 @@ } }, "node_modules/npm-run-path": { - "version": "4.0.1", -- "license": "MIT", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", + "dev": true, + "license": "MIT", "dependencies": { - "path-key": "^3.0.0" + "path-key": "^4.0.0" @@ -16598,6 +16596,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=12" + }, @@ -16607,22 +16606,21 @@ index a38125e..a1067b0 100644 }, "node_modules/nth-check": { "version": "2.1.1", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" - }, -@@ -11781,35 +13402,42 @@ +@@ -11781,6 +14557,8 @@ }, "node_modules/null-check": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", + "integrity": "sha512-j8ZNHg19TyIQOWCGeeQJBuu6xZYIEurf8M1Qsfd8mFrGEfIZytbw18YjKWg+LcO25NowXGZXZpKAx+Ui3TFfDw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" +@@ -11788,15 +14566,22 @@ } }, "node_modules/object-inspect": { @@ -16631,7 +16629,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", "dev": true, -- "license": "MIT", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, @@ -16644,9 +16642,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "devOptional": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4" +@@ -11804,12 +14589,14 @@ } }, "node_modules/object.assign": { @@ -16655,7 +16653,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", @@ -16664,7 +16662,7 @@ index a38125e..a1067b0 100644 "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, -@@ -11821,13 +13449,14 @@ +@@ -11821,13 +14608,15 @@ } }, "node_modules/object.values": { @@ -16673,7 +16671,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", @@ -16684,75 +16682,68 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -11838,13 +13467,15 @@ +@@ -11838,11 +14627,15 @@ }, "node_modules/obuf": { "version": "1.1.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/on-finished": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ee-first": "1.1.1" - }, -@@ -11854,22 +13485,25 @@ +@@ -11854,6 +14647,8 @@ }, "node_modules/on-headers": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -11862,6 +14657,8 @@ }, "node_modules/once": { "version": "1.4.0", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" - } +@@ -11869,6 +14666,8 @@ }, "node_modules/onetime": { "version": "5.1.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" - }, -@@ -11882,15 +13516,17 @@ +@@ -11882,6 +14681,8 @@ }, "node_modules/onetime/node_modules/mimic-fn": { "version": "2.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "license": "MIT", "engines": { "node": ">=6" - } +@@ -11889,6 +14690,8 @@ }, "node_modules/open": { "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", -@@ -11904,16 +13540,17 @@ +@@ -11904,16 +14707,18 @@ } }, "node_modules/optionator": { @@ -16761,7 +16752,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -16774,23 +16765,22 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.8.0" -@@ -11921,45 +13558,56 @@ +@@ -11921,6 +14726,8 @@ }, "node_modules/os-tmpdir": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -11929,35 +14736,49 @@ }, "node_modules/p-cancelable": { "version": "2.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -16801,7 +16791,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-try": "^1.0.0" + "yocto-queue": "^1.0.0" @@ -16820,123 +16810,118 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-limit": "^1.1.0" + "p-limit": "^4.0.0" }, "engines": { - "node": ">=4" +- } +- }, + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" - } - }, ++ } ++ }, "node_modules/p-retry": { "version": "4.6.2", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", + "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/retry": "0.12.0", - "retry": "^0.13.1" -@@ -11970,27 +13618,36 @@ +@@ -11970,6 +14791,8 @@ }, "node_modules/p-retry/node_modules/retry": { "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 4" +@@ -11977,19 +14800,31 @@ } }, "node_modules/p-try": { - "version": "1.0.0", - "dev": true, -- "license": "MIT", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", "engines": { - "node": ">=4" + "node": ">=6" } }, + "node_modules/package-json-from-dist": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", -+ "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", -+ "dev": true ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", ++ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", ++ "dev": true, ++ "license": "BlueOak-1.0.0" + }, "node_modules/pako": { "version": "1.0.11", -- "license": "(MIT AND Zlib)" + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", -+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" ++ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "license": "(MIT AND Zlib)" }, "node_modules/param-case": { "version": "3.0.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "license": "MIT", "dependencies": { "dot-case": "^3.0.4", - "tslib": "^2.0.3" -@@ -11998,8 +13655,9 @@ +@@ -11998,6 +14833,8 @@ }, "node_modules/parent-module": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "callsites": "^3.0.0" - }, -@@ -12009,8 +13667,9 @@ +@@ -12009,6 +14846,8 @@ }, "node_modules/parse-json": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" -@@ -12021,49 +13680,57 @@ +@@ -12021,6 +14860,8 @@ }, "node_modules/parseurl": { "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -12029,6 +14870,8 @@ }, "node_modules/pascal-case": { "version": "3.1.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "license": "MIT", "dependencies": { "no-case": "^3.0.4", - "tslib": "^2.0.3" +@@ -12036,14 +14879,19 @@ } }, "node_modules/path-exists": { - "version": "3.0.0", -- "license": "MIT", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=4" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -16944,86 +16929,81 @@ index a38125e..a1067b0 100644 }, "node_modules/path-is-absolute": { "version": "1.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -12051,6 +14899,8 @@ }, "node_modules/path-key": { "version": "3.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", "engines": { "node": ">=8" - } +@@ -12058,10 +14908,14 @@ }, "node_modules/path-parse": { "version": "1.0.7", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" ++ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" }, "node_modules/path-scurry": { "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, -- "license": "BlueOak-1.0.0", + "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" -@@ -12076,30 +13743,31 @@ +@@ -12076,20 +14930,23 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", -- "dev": true, ++ "version": "10.4.3", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", ++ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, - "license": "ISC", - "engines": { - "node": "14 || >=16.14" - } -+ "version": "10.4.3", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", -+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", -+ "dev": true ++ "license": "ISC" }, "node_modules/path-to-regexp": { - "version": "0.1.7", -- "dev": true, -- "license": "MIT" -+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", -+ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", -+ "dev": true +- "version": "0.1.7", ++ "version": "0.1.10", ++ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", ++ "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "dev": true, + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -12098,6 +14955,8 @@ }, "node_modules/pegjs": { "version": "0.10.0", + "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", + "integrity": "sha512-qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "pegjs": "bin/pegjs" - }, -@@ -12109,12 +13777,13 @@ +@@ -12109,12 +14968,15 @@ }, "node_modules/pend": { "version": "1.2.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" ++ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", + "license": "MIT" }, "node_modules/pg": { - "version": "8.11.5", @@ -17032,119 +17012,145 @@ index a38125e..a1067b0 100644 + "version": "8.11.6", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.6.tgz", + "integrity": "sha512-6CyL4F0j3vPmakU9rWdeRY8qF5Cjc3OE86y6YpgDI6YtKHhNyCjGEIE8U5ZRfBjKTZikwolKIFWh3I22MeRnoA==", ++ "license": "MIT", "dependencies": { "pg-connection-string": "^2.6.4", "pg-pool": "^3.6.2", -@@ -12139,23 +13808,27 @@ +@@ -12139,15 +15001,21 @@ }, "node_modules/pg-cloudflare": { "version": "1.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz", + "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==", + "license": "MIT", "optional": true }, "node_modules/pg-connection-string": { "version": "2.5.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz", -+ "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==" ++ "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==", + "license": "MIT" }, "node_modules/pg-cursor": { - "version": "2.10.3", -- "license": "MIT", -+ "version": "2.11.0", -+ "resolved": "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.11.0.tgz", -+ "integrity": "sha512-TLCOCtu+rqMarzjUi+/Ffc2DV5ZqO/27y5GqnK9Z3w51rWXMwC8FcO96Uf9/ORo5o+qRXEVJxM9Ts3K2K31MLg==", ++ "version": "2.12.0", ++ "resolved": "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.12.0.tgz", ++ "integrity": "sha512-rppw54OnuYZfMUjiJI2zJMwAjjt2V9EtLUb+t7V5tqwSE5Jxod+7vA7Y0FI6Nq976jNLciA0hoVkwvjjB8qzEw==", + "license": "MIT", "peerDependencies": { "pg": "^8" - } +@@ -12155,26 +15023,32 @@ }, "node_modules/pg-int8": { "version": "1.0.1", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "license": "ISC", "engines": { "node": ">=4.0.0" } -@@ -12175,14 +13848,16 @@ + }, + "node_modules/pg-pool": { +- "version": "3.6.2", +- "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz", +- "integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==", ++ "version": "3.7.0", ++ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.7.0.tgz", ++ "integrity": "sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==", ++ "license": "MIT", + "peerDependencies": { + "pg": ">=8.0" + } + }, + "node_modules/pg-protocol": { +- "version": "1.6.1", +- "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz", +- "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==" ++ "version": "1.7.0", ++ "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.7.0.tgz", ++ "integrity": "sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==", ++ "license": "MIT" }, "node_modules/pg-query-stream": { "version": "4.2.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz", + "integrity": "sha512-Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q==", + "license": "MIT", "dependencies": { "pg-cursor": "^2.7.4" - } +@@ -12182,6 +15056,8 @@ }, "node_modules/pg-types": { "version": "2.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "license": "MIT", "dependencies": { "pg-int8": "1.0.1", - "postgres-array": "~2.0.0", -@@ -12201,26 +13876,30 @@ +@@ -12195,12 +15071,15 @@ + } + }, + "node_modules/pg/node_modules/pg-connection-string": { +- "version": "2.6.4", +- "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz", +- "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==" ++ "version": "2.7.0", ++ "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.7.0.tgz", ++ "integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==", ++ "license": "MIT" }, "node_modules/pgpass": { "version": "1.0.5", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", + "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", + "license": "MIT", "dependencies": { "split2": "^4.1.0" - } +@@ -12208,6 +15087,8 @@ }, "node_modules/pgsql-ast-parser": { "version": "7.2.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pgsql-ast-parser/-/pgsql-ast-parser-7.2.1.tgz", + "integrity": "sha512-j8scRJdTBSA1W6nETwevP2dH+BQGdPPFuc0mXolvCRIkRQGTpPoo1hH4a7EQ2KkA4N4quAcNvhOyaIcM7W00yg==", + "license": "MIT", "dependencies": { "moo": "^0.5.1", - "nearley": "^2.19.5" +@@ -12215,11 +15096,15 @@ } }, "node_modules/picocolors": { - "version": "1.0.0", -- "license": "ISC" -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", -+ "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", ++ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", "engines": { "node": ">=8.6" - }, -@@ -12230,8 +13909,9 @@ +@@ -12230,6 +15115,8 @@ }, "node_modules/pify": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", + "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=10" - }, -@@ -12241,7 +13921,8 @@ +@@ -12241,6 +15128,8 @@ }, "node_modules/pinia": { "version": "2.1.7", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.1.7.tgz", + "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==", + "license": "MIT", "dependencies": { "@vue/devtools-api": "^6.5.0", - "vue-demi": ">=0.14.5" -@@ -12264,9 +13945,10 @@ +@@ -12264,7 +15153,9 @@ } }, "node_modules/pinia/node_modules/vue-demi": { @@ -17153,140 +17159,127 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", + "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", "hasInstallScript": true, -- "license": "MIT", + "license": "MIT", "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" -@@ -12289,7 +13971,8 @@ +@@ -12289,6 +15180,8 @@ }, "node_modules/pkg-dir": { "version": "4.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "license": "MIT", "dependencies": { "find-up": "^4.0.0" - }, -@@ -12299,7 +13982,8 @@ +@@ -12299,6 +15192,8 @@ }, "node_modules/pkg-dir/node_modules/find-up": { "version": "4.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", - "path-exists": "^4.0.0" -@@ -12310,7 +13994,8 @@ +@@ -12310,6 +15205,8 @@ }, "node_modules/pkg-dir/node_modules/locate-path": { "version": "5.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" - }, -@@ -12320,7 +14005,8 @@ +@@ -12320,6 +15217,8 @@ }, "node_modules/pkg-dir/node_modules/p-limit": { "version": "2.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", "dependencies": { "p-try": "^2.0.0" - }, -@@ -12333,31 +14019,27 @@ +@@ -12333,6 +15232,8 @@ }, "node_modules/pkg-dir/node_modules/p-locate": { "version": "4.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" - }, - "engines": { -- "node": ">=8" -- } -- }, +@@ -12341,15 +15242,10 @@ + "node": ">=8" + } + }, - "node_modules/pkg-dir/node_modules/p-try": { - "version": "2.2.0", - "license": "MIT", - "engines": { - "node": ">=6" -+ "node": ">=8" - } - }, +- } +- }, "node_modules/pkg-dir/node_modules/path-exists": { "version": "4.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", "engines": { "node": ">=8" - } +@@ -12357,6 +15253,8 @@ }, "node_modules/pkg-up": { "version": "3.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "license": "MIT", "dependencies": { "find-up": "^3.0.0" - }, -@@ -12367,7 +14049,8 @@ +@@ -12367,6 +15265,8 @@ }, "node_modules/pkg-up/node_modules/find-up": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "license": "MIT", "dependencies": { "locate-path": "^3.0.0" - }, -@@ -12377,7 +14060,8 @@ +@@ -12377,6 +15277,8 @@ }, "node_modules/pkg-up/node_modules/locate-path": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "license": "MIT", "dependencies": { "p-locate": "^3.0.0", - "path-exists": "^3.0.0" -@@ -12388,7 +14072,8 @@ +@@ -12388,6 +15290,8 @@ }, "node_modules/pkg-up/node_modules/p-limit": { "version": "2.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", "dependencies": { "p-try": "^2.0.0" - }, -@@ -12401,7 +14086,8 @@ +@@ -12401,6 +15305,8 @@ }, "node_modules/pkg-up/node_modules/p-locate": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "license": "MIT", "dependencies": { "p-limit": "^2.0.0" - }, -@@ -12409,18 +14095,20 @@ +@@ -12409,15 +15315,19 @@ "node": ">=6" } }, - "node_modules/pkg-up/node_modules/p-try": { - "version": "2.2.0", -- "license": "MIT", + "node_modules/pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=4" @@ -17298,33 +17291,26 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-92Sz6XBlfHlb9tK5UCDzIFAuIkHHpemA9zwUaqvo+w7sFMSmVMGmvKcbptof/eJObq63PGnMhM75x7qxhTR78Q==", "dev": true, "hasInstallScript": true, -- "license": "Apache-2.0", - "dependencies": { - "playwright-core": "1.28.1" - }, -@@ -12433,8 +14121,9 @@ + "license": "Apache-2.0", +@@ -12433,6 +15343,8 @@ }, "node_modules/playwright-core": { "version": "1.28.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.1.tgz", + "integrity": "sha512-3PixLnGPno0E8rSBJjtwqTwJe3Yw72QwBBBxNoukIj3lEeBNXwbNiKrNuB1oyQgTBw5QHUhNO3SteEtHaMK6ag==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "bin": { - "playwright": "cli.js" - }, -@@ -12444,8 +14133,9 @@ +@@ -12444,6 +15356,8 @@ }, "node_modules/plist": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", + "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@xmldom/xmldom": "^0.8.8", - "base64-js": "^1.5.1", -@@ -12455,10 +14145,19 @@ +@@ -12455,10 +15369,20 @@ "node": ">=10.4.0" } }, @@ -17333,6 +17319,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">= 0.4" + } @@ -17341,349 +17328,332 @@ index a38125e..a1067b0 100644 - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", -+ "version": "8.4.41", -+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", -+ "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", ++ "version": "8.4.47", ++ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", ++ "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "funding": [ { "type": "opencollective", -@@ -12475,7 +14174,7 @@ +@@ -12473,10 +15397,11 @@ + "url": "https://github.com/sponsors/ai" + } ], ++ "license": "MIT", "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", -+ "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" +- "source-map-js": "^1.2.0" ++ "picocolors": "^1.1.0", ++ "source-map-js": "^1.2.1" }, "engines": { -@@ -12484,7 +14183,8 @@ + "node": "^10 || ^12 || >=14" +@@ -12484,6 +15409,8 @@ }, "node_modules/postcss-html": { "version": "1.5.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.5.0.tgz", + "integrity": "sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA==", + "license": "MIT", "dependencies": { "htmlparser2": "^8.0.0", - "js-tokens": "^8.0.0", -@@ -12496,17 +14196,20 @@ +@@ -12496,16 +15423,22 @@ } }, "node_modules/postcss-html/node_modules/js-tokens": { - "version": "8.0.2", -- "license": "MIT" + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz", -+ "integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==" ++ "integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==", + "license": "MIT" }, "node_modules/postcss-media-query-parser": { "version": "0.2.3", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/postcss-modules-extract-imports": { - "version": "3.0.0", -- "license": "ISC", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", + "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", + "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" - }, -@@ -12515,8 +14218,9 @@ +@@ -12515,7 +15448,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.3", -- "license": "MIT", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", + "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", -@@ -12530,8 +14234,9 @@ +@@ -12530,7 +15465,9 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.0.0", -- "license": "ISC", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", + "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "license": "ISC", "dependencies": { "postcss-selector-parser": "^6.0.4" - }, -@@ -12544,7 +14249,8 @@ +@@ -12544,6 +15481,8 @@ }, "node_modules/postcss-modules-values": { "version": "4.0.0", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", + "license": "ISC", "dependencies": { "icss-utils": "^5.0.0" - }, -@@ -12556,13 +14262,15 @@ +@@ -12556,12 +15495,16 @@ } }, "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.1", -- "dev": true, -- "license": "MIT" + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", + "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/postcss-safe-parser": { "version": "6.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", + "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", + "license": "MIT", "engines": { "node": ">=12.0" - }, -@@ -12575,8 +14283,9 @@ +@@ -12575,7 +15518,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.13", -- "license": "MIT", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", "dependencies": { "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" -@@ -12587,32 +14296,37 @@ +@@ -12587,10 +15532,14 @@ }, "node_modules/postcss-value-parser": { "version": "4.2.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", -+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" ++ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "license": "MIT" }, "node_modules/postgres-array": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "license": "MIT", "engines": { "node": ">=4" - } +@@ -12598,6 +15547,8 @@ }, "node_modules/postgres-bytea": { "version": "1.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -12605,6 +15556,8 @@ }, "node_modules/postgres-date": { "version": "1.0.7", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -12612,6 +15565,8 @@ }, "node_modules/postgres-interval": { "version": "1.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "license": "MIT", "dependencies": { "xtend": "^4.0.0" - }, -@@ -12621,8 +14335,9 @@ +@@ -12621,7 +15576,9 @@ } }, "node_modules/prebuild-install": { - "version": "7.1.1", -- "license": "MIT", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", + "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", + "license": "MIT", "dependencies": { "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", -@@ -12646,15 +14361,17 @@ +@@ -12646,6 +15603,8 @@ }, "node_modules/prelude-ls": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8.0" - } +@@ -12654,6 +15613,8 @@ }, "node_modules/pretty-error": { "version": "4.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", + "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", + "license": "MIT", "dependencies": { "lodash": "^4.17.20", - "renderkid": "^3.0.0" -@@ -12662,18 +14379,21 @@ +@@ -12662,10 +15623,14 @@ }, "node_modules/process-nextick-args": { "version": "2.0.1", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" ++ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" }, "node_modules/progress": { "version": "2.0.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "license": "MIT", "engines": { "node": ">=0.4.0" - } +@@ -12673,6 +15638,8 @@ }, "node_modules/progress-webpack-plugin": { "version": "1.0.16", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz", + "integrity": "sha512-sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA==", + "license": "MIT", "dependencies": { "chalk": "^2.1.0", - "figures": "^2.0.0", -@@ -12688,7 +14408,8 @@ +@@ -12688,6 +15655,8 @@ }, "node_modules/progress-webpack-plugin/node_modules/ansi-styles": { "version": "3.2.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" - }, -@@ -12698,7 +14419,8 @@ +@@ -12698,6 +15667,8 @@ }, "node_modules/progress-webpack-plugin/node_modules/chalk": { "version": "2.4.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", -@@ -12710,25 +14432,29 @@ +@@ -12710,6 +15681,8 @@ }, "node_modules/progress-webpack-plugin/node_modules/color-convert": { "version": "1.9.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", "dependencies": { "color-name": "1.1.3" - } +@@ -12717,10 +15690,14 @@ }, "node_modules/progress-webpack-plugin/node_modules/color-name": { "version": "1.1.3", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", -+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" ++ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" }, "node_modules/progress-webpack-plugin/node_modules/escape-string-regexp": { "version": "1.0.5", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", "engines": { "node": ">=0.8.0" - } +@@ -12728,6 +15705,8 @@ }, "node_modules/progress-webpack-plugin/node_modules/figures": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==", + "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" - }, -@@ -12738,14 +14464,16 @@ +@@ -12738,6 +15717,8 @@ }, "node_modules/progress-webpack-plugin/node_modules/has-flag": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", "engines": { "node": ">=4" - } +@@ -12745,6 +15726,8 @@ }, "node_modules/progress-webpack-plugin/node_modules/supports-color": { "version": "5.5.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" - }, -@@ -12755,8 +14483,9 @@ +@@ -12755,6 +15738,8 @@ }, "node_modules/promise-retry": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" -@@ -12767,8 +14496,9 @@ +@@ -12767,6 +15752,8 @@ }, "node_modules/proxy-addr": { "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" -@@ -12779,15 +14509,17 @@ +@@ -12779,6 +15766,8 @@ }, "node_modules/proxy-addr/node_modules/ipaddr.js": { "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.10" +@@ -12786,7 +15775,9 @@ } }, "node_modules/pump": { - "version": "3.0.0", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", -+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", +- "version": "3.0.0", ++ "version": "3.0.2", ++ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", ++ "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", - "once": "^1.3.1" -@@ -12795,15 +14527,18 @@ +@@ -12795,6 +15786,8 @@ }, "node_modules/punycode": { "version": "2.3.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", "engines": { "node": ">=6" - } +@@ -12802,6 +15795,9 @@ }, "node_modules/q": { "version": "1.5.1", @@ -17691,22 +17661,25 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" -@@ -12811,8 +14546,9 @@ +@@ -12810,11 +15806,13 @@ + } }, "node_modules/qs": { - "version": "6.11.0", -+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", -+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", +- "version": "6.11.0", ++ "version": "6.13.0", ++ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", ++ "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, -- "license": "BSD-3-Clause", + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" +- "side-channel": "^1.0.4" ++ "side-channel": "^1.0.6" }, -@@ -12825,6 +14561,8 @@ + "engines": { + "node": ">=0.6" +@@ -12825,6 +15823,8 @@ }, "node_modules/queue-microtask": { "version": "1.2.3", @@ -17715,149 +17688,129 @@ index a38125e..a1067b0 100644 "dev": true, "funding": [ { -@@ -12839,12 +14577,12 @@ - "type": "consulting", - "url": "https://feross.org/support" - } -- ], -- "license": "MIT" -+ ] +@@ -12844,6 +15844,8 @@ }, "node_modules/quick-lru": { "version": "5.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "license": "MIT", "engines": { "node": ">=10" - }, -@@ -12854,11 +14592,13 @@ +@@ -12854,10 +15856,14 @@ }, "node_modules/railroad-diagrams": { "version": "1.0.0", -- "license": "CC0-1.0" + "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz", -+ "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==" ++ "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==", + "license": "CC0-1.0" }, "node_modules/randexp": { "version": "0.4.6", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz", + "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==", + "license": "MIT", "dependencies": { "discontinuous-range": "1.0.0", - "ret": "~0.1.10" -@@ -12869,23 +14609,26 @@ +@@ -12869,6 +15875,8 @@ }, "node_modules/randombytes": { "version": "2.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" - } +@@ -12876,6 +15884,8 @@ }, "node_modules/range-parser": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" - } +@@ -12884,6 +15894,8 @@ }, "node_modules/raw-body": { "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", -@@ -12898,16 +14641,18 @@ +@@ -12898,6 +15910,8 @@ }, "node_modules/raw-body/node_modules/bytes": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -12906,6 +15920,8 @@ }, "node_modules/raw-body/node_modules/iconv-lite": { "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, -@@ -12917,7 +14662,8 @@ +@@ -12917,6 +15933,8 @@ }, "node_modules/rc": { "version": "1.2.8", -- "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", "dependencies": { "deep-extend": "^0.6.0", - "ini": "~1.3.0", -@@ -12928,17 +14674,24 @@ +@@ -12928,8 +15946,16 @@ "rc": "cli.js" } }, + "node_modules/rc/node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", -+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" ++ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", ++ "license": "ISC" + }, "node_modules/rc/node_modules/strip-json-comments": { "version": "2.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -12937,6 +15963,8 @@ }, "node_modules/read-config-file": { "version": "6.3.2", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz", + "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "config-file-ts": "^0.2.4", - "dotenv": "^9.0.2", -@@ -12953,8 +14706,9 @@ +@@ -12953,6 +15981,8 @@ }, "node_modules/read-pkg": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", -@@ -12966,8 +14720,9 @@ +@@ -12966,6 +15996,8 @@ }, "node_modules/read-pkg-up": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" -@@ -12976,10 +14731,78 @@ +@@ -12976,8 +16008,83 @@ "node": ">=4" } }, @@ -17866,6 +17819,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, @@ -17878,6 +17832,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" @@ -17891,6 +17846,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "p-try": "^1.0.0" + }, @@ -17903,6 +17859,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "p-limit": "^1.1.0" + }, @@ -17915,6 +17872,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=4" + } @@ -17924,6 +17882,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=4" + } @@ -17933,232 +17892,234 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "pify": "^3.0.0" - }, -@@ -12989,15 +14812,17 @@ +@@ -12989,6 +16096,8 @@ }, "node_modules/read-pkg/node_modules/pify": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" - } +@@ -12997,6 +16106,8 @@ }, "node_modules/readable-stream": { "version": "3.6.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", - "string_decoder": "^1.1.1", -@@ -13009,8 +14834,9 @@ +@@ -13009,6 +16120,8 @@ }, "node_modules/readdir-glob": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", + "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "peer": true, - "dependencies": { - "minimatch": "^5.1.0" -@@ -13018,7 +14844,8 @@ +@@ -13018,6 +16131,8 @@ }, "node_modules/readdirp": { "version": "3.6.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" - }, -@@ -13028,7 +14855,8 @@ +@@ -13028,6 +16143,8 @@ }, "node_modules/rechoir": { "version": "0.7.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "license": "MIT", "dependencies": { "resolve": "^1.9.0" - }, -@@ -13038,8 +14866,9 @@ +@@ -13038,6 +16155,8 @@ }, "node_modules/redent": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" -@@ -13050,13 +14879,15 @@ +@@ -13050,11 +16169,15 @@ }, "node_modules/regenerate": { "version": "1.4.2", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.1", -+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", -+ "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", +- "version": "10.1.1", ++ "version": "10.2.0", ++ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz", ++ "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "regenerate": "^1.4.2" - }, -@@ -13065,26 +14896,30 @@ +@@ -13065,12 +16188,16 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.14.0", -- "dev": true, -- "license": "MIT" + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regenerator-transform": { "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/runtime": "^7.8.4" +@@ -13078,13 +16205,16 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", -+ "version": "1.5.2", -+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", -+ "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", ++ "version": "1.5.3", ++ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", ++ "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" -+ "call-bind": "^1.0.6", ++ "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", -+ "set-function-name": "^2.0.1" ++ "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" -@@ -13095,8 +14930,9 @@ +@@ -13095,6 +16225,8 @@ }, "node_modules/regexpp": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - }, -@@ -13106,8 +14942,9 @@ +@@ -13105,14 +16237,16 @@ + } }, "node_modules/regexpu-core": { - "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", -+ "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", +- "version": "5.3.2", ++ "version": "6.1.1", ++ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz", ++ "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/regjsgen": "^0.8.0", +- "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", -@@ -13122,8 +14959,9 @@ - }, - "node_modules/regjsparser": { - "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", -+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", - "dev": true, -- "license": "BSD-2-Clause", - "dependencies": { - "jsesc": "~0.5.0" +- "regenerate-unicode-properties": "^10.1.0", +- "regjsparser": "^0.9.1", ++ "regenerate-unicode-properties": "^10.2.0", ++ "regjsgen": "^0.8.0", ++ "regjsparser": "^0.11.0", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.1.0" }, -@@ -13133,6 +14971,8 @@ +@@ -13120,26 +16254,30 @@ + "node": ">=4" + } }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", -+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", ++ "node_modules/regjsgen": { ++ "version": "0.8.0", ++ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", ++ "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", ++ "dev": true, ++ "license": "MIT" ++ }, + "node_modules/regjsparser": { +- "version": "0.9.1", ++ "version": "0.11.1", ++ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz", ++ "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==", "dev": true, + "license": "BSD-2-Clause", + "dependencies": { +- "jsesc": "~0.5.0" ++ "jsesc": "~3.0.2" + }, "bin": { - "jsesc": "bin/jsesc" -@@ -13140,14 +14980,16 @@ + "regjsparser": "bin/parser" + } }, +- "node_modules/regjsparser/node_modules/jsesc": { +- "version": "0.5.0", +- "dev": true, +- "bin": { +- "jsesc": "bin/jsesc" +- } +- }, "node_modules/relateurl": { "version": "0.2.7", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "license": "MIT", "engines": { "node": ">= 0.10" - } +@@ -13147,6 +16285,8 @@ }, "node_modules/renderkid": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", + "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", + "license": "MIT", "dependencies": { "css-select": "^4.1.3", - "dom-converter": "^0.2.0", -@@ -13158,7 +15000,8 @@ +@@ -13158,6 +16298,8 @@ }, "node_modules/renderkid/node_modules/dom-serializer": { "version": "1.4.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", -@@ -13170,7 +15013,8 @@ +@@ -13170,6 +16312,8 @@ }, "node_modules/renderkid/node_modules/domhandler": { "version": "4.3.1", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.2.0" - }, -@@ -13183,7 +15027,8 @@ +@@ -13183,6 +16327,8 @@ }, "node_modules/renderkid/node_modules/domutils": { "version": "2.8.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", -@@ -13195,13 +15040,16 @@ +@@ -13195,6 +16341,8 @@ }, "node_modules/renderkid/node_modules/entities": { "version": "2.2.0", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" - } +@@ -13202,6 +16350,8 @@ }, "node_modules/renderkid/node_modules/htmlparser2": { "version": "6.1.0", @@ -18167,85 +18128,72 @@ index a38125e..a1067b0 100644 "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { -@@ -13209,7 +15057,6 @@ - "url": "https://github.com/sponsors/fb55" - } - ], -- "license": "MIT", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", -@@ -13219,32 +15066,37 @@ +@@ -13219,6 +16369,8 @@ }, "node_modules/require-directory": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10.0" - } +@@ -13227,6 +16379,8 @@ }, "node_modules/require-from-string": { "version": "2.0.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "license": "MIT", "engines": { "node": ">=0.10.0" - } +@@ -13234,16 +16388,22 @@ }, "node_modules/require-main-filename": { "version": "2.0.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/requires-port": { "version": "1.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/resolve": { "version": "1.22.8", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", -@@ -13259,11 +15111,13 @@ +@@ -13259,10 +16419,14 @@ }, "node_modules/resolve-alpn": { "version": "1.2.1", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", -+ "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" ++ "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "license": "MIT" }, "node_modules/resolve-cwd": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" - }, -@@ -13271,24 +15125,18 @@ +@@ -13271,23 +16435,19 @@ "node": ">=8" } }, - "node_modules/resolve-cwd/node_modules/resolve-from": { + "node_modules/resolve-from": { "version": "5.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "license": "MIT", "engines": { "node": ">=8" } @@ -18260,24 +18208,21 @@ index a38125e..a1067b0 100644 - }, "node_modules/responselike": { "version": "2.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "license": "MIT", "dependencies": { "lowercase-keys": "^2.0.0" - }, -@@ -13298,8 +15146,9 @@ +@@ -13298,6 +16458,8 @@ }, "node_modules/restore-cursor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" -@@ -13308,25 +15157,34 @@ +@@ -13308,8 +16470,17 @@ "node": ">=8" } }, @@ -18285,68 +18230,63 @@ index a38125e..a1067b0 100644 + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", -+ "dev": true ++ "dev": true, ++ "license": "ISC" + }, "node_modules/ret": { "version": "0.1.15", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "license": "MIT", "engines": { "node": ">=0.12" - } +@@ -13317,6 +16488,8 @@ }, "node_modules/retry": { "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 4" - } +@@ -13325,6 +16498,8 @@ }, "node_modules/reusify": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" -@@ -13334,7 +15192,9 @@ +@@ -13334,6 +16509,9 @@ }, "node_modules/rimraf": { "version": "3.0.2", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", "dependencies": { "glob": "^7.1.3" - }, -@@ -13347,7 +15207,8 @@ +@@ -13347,6 +16525,8 @@ }, "node_modules/roarr": { "version": "2.15.4", -- "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", + "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", + "license": "BSD-3-Clause", "optional": true, "dependencies": { - "boolean": "^3.0.1", -@@ -13363,14 +15224,17 @@ +@@ -13363,6 +16543,8 @@ }, "node_modules/run-async": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.12.0" - } +@@ -13371,6 +16553,8 @@ }, "node_modules/run-parallel": { "version": "1.2.0", @@ -18355,33 +18295,23 @@ index a38125e..a1067b0 100644 "dev": true, "funding": [ { -@@ -13386,15 +15250,15 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } +@@ -13393,6 +16577,8 @@ }, "node_modules/rxjs": { "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "tslib": "^1.9.0" - }, -@@ -13404,16 +15268,18 @@ +@@ -13404,16 +16590,20 @@ }, "node_modules/rxjs/node_modules/tslib": { "version": "1.14.1", -- "dev": true, -- "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", -+ "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/safe-array-concat": { - "version": "1.0.1", @@ -18389,7 +18319,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", @@ -18398,7 +18328,7 @@ index a38125e..a1067b0 100644 "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, -@@ -13426,6 +15292,8 @@ +@@ -13426,6 +16616,8 @@ }, "node_modules/safe-buffer": { "version": "5.2.1", @@ -18407,13 +18337,8 @@ index a38125e..a1067b0 100644 "funding": [ { "type": "github", -@@ -13439,37 +15307,43 @@ - "type": "consulting", - "url": "https://feross.org/support" - } -- ], -- "license": "MIT" -+ ] +@@ -13443,24 +16635,33 @@ + "license": "MIT" }, "node_modules/safe-regex-test": { - "version": "1.0.0", @@ -18421,7 +18346,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", @@ -18438,57 +18363,53 @@ index a38125e..a1067b0 100644 }, "node_modules/safer-buffer": { "version": "2.1.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" ++ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" }, "node_modules/sanitize-filename": { "version": "1.6.3", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", + "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", "dev": true, -- "license": "WTFPL OR ISC", + "license": "WTFPL OR ISC", "dependencies": { - "truncate-utf8-bytes": "^1.0.0" - } +@@ -13469,6 +16670,8 @@ }, "node_modules/sass": { "version": "1.42.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz", + "integrity": "sha512-/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg==", + "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0" - }, -@@ -13482,7 +15356,8 @@ +@@ -13482,6 +16685,8 @@ }, "node_modules/sass-loader": { "version": "12.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.3.0.tgz", + "integrity": "sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA==", + "license": "MIT", "dependencies": { "klona": "^2.0.4", - "neo-async": "^2.6.2" -@@ -13513,12 +15388,14 @@ +@@ -13513,11 +16718,15 @@ } }, "node_modules/sax": { - "version": "1.3.0", -- "license": "ISC" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", -+ "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==" ++ "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", + "license": "ISC" }, "node_modules/schema-utils": { "version": "2.7.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", -@@ -13532,15 +15409,45 @@ +@@ -13532,13 +16741,48 @@ "url": "https://opencollective.com/webpack" } }, @@ -18496,6 +18417,7 @@ index a38125e..a1067b0 100644 + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", ++ "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", @@ -18511,6 +18433,7 @@ index a38125e..a1067b0 100644 + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ++ "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } @@ -18518,91 +18441,93 @@ index a38125e..a1067b0 100644 + "node_modules/schema-utils/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", ++ "license": "MIT" + }, "node_modules/select-hose": { "version": "2.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/selfsigned": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", + "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/node-forge": "^1.3.0", - "node-forge": "^1" -@@ -13551,20 +15458,23 @@ +@@ -13551,6 +16795,8 @@ }, "node_modules/semver": { "version": "6.3.1", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", "bin": { "semver": "bin/semver.js" - } +@@ -13558,11 +16804,15 @@ }, "node_modules/semver-compare": { "version": "1.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", + "license": "MIT", "optional": true }, "node_modules/send": { - "version": "0.18.0", -+ "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", -+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", +- "version": "0.18.0", ++ "version": "0.19.0", ++ "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", ++ "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", -@@ -13586,21 +15496,24 @@ +@@ -13586,6 +16836,8 @@ }, "node_modules/send/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ms": "2.0.0" - } +@@ -13594,11 +16846,25 @@ }, "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true + "dev": true, + "license": "MIT" }, ++ "node_modules/send/node_modules/encodeurl": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", ++ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">= 0.8" ++ } ++ }, "node_modules/send/node_modules/mime": { "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "mime": "cli.js" - }, -@@ -13610,15 +15523,19 @@ +@@ -13608,16 +16874,15 @@ + "node": ">=4" + } }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", +- "node_modules/send/node_modules/ms": { +- "version": "2.1.3", - "dev": true, - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -+ "dev": true - }, +- }, "node_modules/seq-queue": { - "version": "0.0.5" + "version": "0.0.5", @@ -18611,127 +18536,123 @@ index a38125e..a1067b0 100644 }, "node_modules/serialize-error": { "version": "7.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", + "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "license": "MIT", "optional": true, "dependencies": { - "type-fest": "^0.13.1" -@@ -13632,7 +15549,8 @@ +@@ -13632,6 +16897,8 @@ }, "node_modules/serialize-error/node_modules/type-fest": { "version": "0.13.1", -- "license": "(MIT OR CC0-1.0)", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "license": "(MIT OR CC0-1.0)", "optional": true, "engines": { - "node": ">=10" -@@ -13643,15 +15561,17 @@ +@@ -13643,6 +16910,8 @@ }, "node_modules/serialize-javascript": { "version": "6.0.2", -- "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" - } +@@ -13650,6 +16919,8 @@ }, "node_modules/serve-index": { "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "accepts": "~1.3.4", - "batch": "0.6.1", -@@ -13667,24 +15587,27 @@ +@@ -13667,6 +16938,8 @@ }, "node_modules/serve-index/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ms": "2.0.0" - } +@@ -13675,6 +16948,8 @@ }, "node_modules/serve-index/node_modules/depd": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" - } +@@ -13683,6 +16958,8 @@ }, "node_modules/serve-index/node_modules/http-errors": { "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", -@@ -13697,31 +15620,36 @@ +@@ -13697,21 +16974,29 @@ }, "node_modules/serve-index/node_modules/inherits": { "version": "2.0.3", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/serve-index/node_modules/ms": { "version": "2.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/serve-index/node_modules/statuses": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.6" +@@ -13719,14 +17004,16 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", -+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", -+ "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", +- "version": "1.15.0", ++ "version": "1.16.2", ++ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", ++ "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", +- "encodeurl": "~1.0.2", ++ "encodeurl": "~2.0.0", "escape-html": "~1.0.3", -@@ -13734,31 +15662,37 @@ + "parseurl": "~1.3.3", +- "send": "0.18.0" ++ "send": "0.19.0" + }, + "engines": { + "node": ">= 0.8.0" +@@ -13734,31 +17021,40 @@ }, "node_modules/set-blocking": { "version": "2.0.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/set-function-length": { - "version": "1.1.1", @@ -18739,7 +18660,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", @@ -18761,7 +18682,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "define-data-property": "^1.0.1", + "define-data-property": "^1.1.4", @@ -18772,47 +18693,44 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -13766,16 +15700,19 @@ +@@ -13766,15 +17062,21 @@ }, "node_modules/setimmediate": { "version": "1.0.5", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", -+ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" ++ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "license": "MIT" }, "node_modules/setprototypeof": { "version": "1.2.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/shallow-clone": { "version": "3.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "license": "MIT", "dependencies": { "kind-of": "^6.0.2" - }, -@@ -13785,7 +15722,8 @@ +@@ -13785,6 +17087,8 @@ }, "node_modules/shebang-command": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" - }, -@@ -13795,30 +15733,46 @@ +@@ -13795,30 +17099,49 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", "engines": { "node": ">=8" } @@ -18823,7 +18741,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", @@ -18847,6 +18765,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, ++ "license": "ISC", + "engines": { + "node": ">=14" + }, @@ -18861,13 +18780,7 @@ index a38125e..a1067b0 100644 "funding": [ { "type": "github", -@@ -13832,11 +15786,12 @@ - "type": "consulting", - "url": "https://feross.org/support" - } -- ], -- "license": "MIT" -+ ] +@@ -13837,6 +17160,8 @@ }, "node_modules/simple-get": { "version": "4.0.1", @@ -18876,26 +18789,16 @@ index a38125e..a1067b0 100644 "funding": [ { "type": "github", -@@ -13851,7 +15806,6 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT", - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", -@@ -13860,8 +15814,9 @@ +@@ -13860,6 +17185,8 @@ }, "node_modules/simple-update-notifier": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "semver": "^7.5.3" - }, -@@ -13869,24 +15824,11 @@ +@@ -13869,24 +17196,12 @@ "node": ">=10" } }, @@ -18916,14 +18819,14 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -13894,23 +15836,46 @@ +@@ -13894,21 +17209,48 @@ "node": ">=10" } }, @@ -18935,6 +18838,7 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, - "license": "ISC" ++ "license": "MIT", + "engines": { + "node": ">=8" + } @@ -18945,7 +18849,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, -- "license": "MIT", + "license": "MIT", + "optional": true, + "dependencies": { + "ansi-styles": "^4.0.0", @@ -18961,6 +18865,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "dev": true, ++ "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6.0.0", @@ -18972,148 +18877,145 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "faye-websocket": "^0.11.3", - "uuid": "^8.3.2", -@@ -13919,11 +15884,13 @@ +@@ -13919,25 +17261,32 @@ }, "node_modules/sortablejs": { "version": "1.14.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", -+ "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" ++ "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==", + "license": "MIT" }, "node_modules/source-map": { "version": "0.6.1", -- "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", +- "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", ++ "version": "1.2.1", ++ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", ++ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", ++ "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } -@@ -13938,7 +15905,8 @@ }, "node_modules/source-map-support": { "version": "0.5.21", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", - "source-map": "^0.6.0" -@@ -13946,40 +15914,47 @@ +@@ -13946,10 +17295,15 @@ }, "node_modules/sourcemap-codec": { "version": "1.4.8", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", -+ "deprecated": "Please use @jridgewell/sourcemap-codec instead" ++ "deprecated": "Please use @jridgewell/sourcemap-codec instead", + "license": "MIT" }, "node_modules/spdx-correct": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" +@@ -13958,12 +17312,16 @@ } }, "node_modules/spdx-exceptions": { - "version": "2.3.0", -- "dev": true, -- "license": "CC-BY-3.0" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", -+ "dev": true + "dev": true, + "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" +@@ -13972,12 +17330,16 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.16", -- "dev": true, -- "license": "CC0-1.0" + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", -+ "dev": true + "dev": true, + "license": "CC0-1.0" }, "node_modules/spdy": { "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", -@@ -13993,8 +15968,9 @@ +@@ -13993,6 +17355,8 @@ }, "node_modules/spdy-transport": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", -@@ -14006,12 +15982,14 @@ +@@ -14006,10 +17370,14 @@ }, "node_modules/spectre.css": { "version": "0.5.9", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/spectre.css/-/spectre.css-0.5.9.tgz", -+ "integrity": "sha512-9jUqwZmCnvflrxFGcK+ize43TvjwDjqMwZPVubEtSIHzvinH0TBUESm1LcOJx3Ur7bdPaeOHQIjOqBl1Y5kLFw==" ++ "integrity": "sha512-9jUqwZmCnvflrxFGcK+ize43TvjwDjqMwZPVubEtSIHzvinH0TBUESm1LcOJx3Ur7bdPaeOHQIjOqBl1Y5kLFw==", + "license": "MIT" }, "node_modules/split": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "through": "2" - }, -@@ -14021,18 +15999,21 @@ +@@ -14021,6 +17389,8 @@ }, "node_modules/split2": { "version": "4.2.0", -- "license": "ISC", + "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", + "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", + "license": "ISC", "engines": { "node": ">= 10.x" - } +@@ -14028,10 +17398,14 @@ }, "node_modules/sprintf-js": { "version": "1.1.2", -- "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", -+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" ++ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "license": "BSD-3-Clause" }, "node_modules/sql-formatter": { "version": "13.0.4", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-13.0.4.tgz", + "integrity": "sha512-6pns27iQ5yT8jmle4cqvpfXNl29/AGOT4KtmzhtI2zgH1J0RbpZdduqTRzem7UCta+gvrj4HC1O9l6mTSUHoRg==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "get-stdin": "=8.0.0", -@@ -14043,7 +16024,9 @@ +@@ -14043,7 +17417,9 @@ } }, "node_modules/sql-highlight": { @@ -19124,23 +19026,16 @@ index a38125e..a1067b0 100644 "funding": [ "https://github.com/scriptcoded/sql-highlight?sponsor=1", { -@@ -14051,20 +16034,22 @@ - "url": "https://github.com/sponsors/scriptcoded" - } - ], -- "license": "MIT", - "engines": { - "node": ">=14" - } +@@ -14058,6 +17434,8 @@ }, "node_modules/sqlstring": { "version": "2.3.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz", + "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==", + "license": "MIT", "engines": { "node": ">= 0.6" - } +@@ -14065,6 +17443,8 @@ }, "node_modules/ssh2": { "version": "1.14.0", @@ -19149,7 +19044,7 @@ index a38125e..a1067b0 100644 "hasInstallScript": true, "dependencies": { "asn1": "^0.2.6", -@@ -14080,8 +16065,10 @@ +@@ -14080,6 +17460,9 @@ }, "node_modules/standard-version": { "version": "9.3.2", @@ -19157,67 +19052,59 @@ index a38125e..a1067b0 100644 + "integrity": "sha512-u1rfKP4o4ew7Yjbfycv80aNMN2feTiqseAhUhrrx2XtdQGmu7gucpziXe68Z4YfHVqlxVEzo4aUA0Iu3VQOTgQ==", + "deprecated": "standard-version is deprecated. If you're a GitHub user, I recommend https://github.com/googleapis/release-please as an alternative.", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "chalk": "^2.4.2", - "conventional-changelog": "3.1.24", -@@ -14108,8 +16095,9 @@ +@@ -14108,6 +17491,8 @@ }, "node_modules/standard-version/node_modules/ansi-styles": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "color-convert": "^1.9.0" - }, -@@ -14119,8 +16107,9 @@ +@@ -14119,6 +17504,8 @@ }, "node_modules/standard-version/node_modules/chalk": { "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", -@@ -14132,8 +16121,9 @@ +@@ -14132,6 +17519,8 @@ }, "node_modules/standard-version/node_modules/cliui": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", -@@ -14142,29 +16132,47 @@ +@@ -14142,6 +17531,8 @@ }, "node_modules/standard-version/node_modules/color-convert": { "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "color-name": "1.1.3" - } +@@ -14150,11 +17541,30 @@ }, "node_modules/standard-version/node_modules/color-name": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", -+ "dev": true -+ }, + "dev": true, + "license": "MIT" + }, + "node_modules/standard-version/node_modules/conventional-changelog-conventionalcommits": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.1.tgz", + "integrity": "sha512-lzWJpPZhbM1R0PIzkwzGBCnAkH5RKJzJfFQZcl/D+2lsJxAwGnDKBqn/F4C1RD31GJNn8NuKWQzAZDAVXPp2Mw==", - "dev": true, -- "license": "MIT" ++ "dev": true, ++ "license": "ISC", + "dependencies": { + "compare-func": "^2.0.0", + "lodash": "^4.17.15", @@ -19226,48 +19113,42 @@ index a38125e..a1067b0 100644 + "engines": { + "node": ">=10" + } - }, ++ }, "node_modules/standard-version/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.8.0" - } +@@ -14163,6 +17573,8 @@ }, "node_modules/standard-version/node_modules/find-up": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" -@@ -14178,16 +16186,18 @@ +@@ -14178,6 +17590,8 @@ }, "node_modules/standard-version/node_modules/has-flag": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" - } +@@ -14186,6 +17600,8 @@ }, "node_modules/standard-version/node_modules/locate-path": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-locate": "^5.0.0" - }, -@@ -14198,21 +16208,11 @@ +@@ -14198,19 +17614,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, @@ -19287,31 +19168,27 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "yocto-queue": "^0.1.0" - }, -@@ -14225,8 +16225,9 @@ +@@ -14225,6 +17632,8 @@ }, "node_modules/standard-version/node_modules/p-locate": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-limit": "^3.0.2" - }, -@@ -14239,19 +16240,18 @@ +@@ -14239,6 +17648,8 @@ }, "node_modules/standard-version/node_modules/path-exists": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" +@@ -14246,12 +17657,11 @@ } }, "node_modules/standard-version/node_modules/semver": { @@ -19320,64 +19197,58 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -14261,8 +16261,9 @@ +@@ -14261,6 +17671,8 @@ }, "node_modules/standard-version/node_modules/supports-color": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" - }, -@@ -14272,8 +16273,9 @@ +@@ -14272,6 +17684,8 @@ }, "node_modules/standard-version/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", -@@ -14288,8 +16290,9 @@ +@@ -14288,6 +17702,8 @@ }, "node_modules/standard-version/node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" - }, -@@ -14302,8 +16305,9 @@ +@@ -14302,6 +17718,8 @@ }, "node_modules/standard-version/node_modules/wrap-ansi/node_modules/color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" - }, -@@ -14313,26 +16317,15 @@ +@@ -14313,24 +17731,15 @@ }, "node_modules/standard-version/node_modules/wrap-ansi/node_modules/color-name": { "version": "1.1.4", -- "dev": true, -- "license": "MIT" -- }, ++ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", ++ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, - "node_modules/standard-version/node_modules/y18n": { - "version": "5.0.8", - "dev": true, @@ -19390,20 +19261,15 @@ index a38125e..a1067b0 100644 - "version": "4.0.0", - "dev": true, - "license": "ISC" -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", -+ "dev": true - }, +- }, "node_modules/standard-version/node_modules/yargs": { "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", -@@ -14346,33 +16339,58 @@ +@@ -14346,8 +17755,33 @@ "node": ">=10" } }, @@ -19412,6 +19278,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, ++ "license": "ISC", + "engines": { + "node": ">=10" + } @@ -19421,6 +19288,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=10" + }, @@ -19433,51 +19301,45 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", + "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 6" - } +@@ -14356,6 +17790,8 @@ }, "node_modules/statuses": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -14364,6 +17800,8 @@ }, "node_modules/string_decoder": { "version": "1.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" - } +@@ -14371,6 +17809,8 @@ }, "node_modules/string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", -@@ -14385,8 +16403,9 @@ +@@ -14385,6 +17825,8 @@ "node_modules/string-width-cjs": { "name": "string-width", "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", -@@ -14397,13 +16416,15 @@ +@@ -14397,13 +17839,16 @@ } }, "node_modules/string.prototype.trim": { @@ -19486,7 +19348,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", @@ -19498,7 +19360,7 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -14413,26 +16434,31 @@ +@@ -14413,26 +17858,33 @@ } }, "node_modules/string.prototype.trimend": { @@ -19507,7 +19369,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", @@ -19526,7 +19388,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", @@ -19540,55 +19402,51 @@ index a38125e..a1067b0 100644 }, "funding": { "url": "https://github.com/sponsors/ljharb" -@@ -14440,12 +16466,15 @@ +@@ -14440,11 +17892,16 @@ }, "node_modules/stringify-package": { "version": "1.0.1", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz", + "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==", + "deprecated": "This module is not used anymore, and has been replaced by @npmcli/package-json", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/strip-ansi": { "version": "6.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" - }, -@@ -14456,8 +16485,9 @@ +@@ -14456,6 +17913,8 @@ "node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" - }, -@@ -14467,23 +16497,30 @@ +@@ -14467,6 +17926,8 @@ }, "node_modules/strip-bom": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" +@@ -14474,14 +17935,22 @@ } }, "node_modules/strip-final-newline": { - "version": "2.0.0", -- "license": "MIT", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=12" @@ -19602,86 +19460,72 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "min-indent": "^1.0.0" - }, -@@ -14493,8 +16530,9 @@ +@@ -14493,6 +17962,8 @@ }, "node_modules/strip-json-comments": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - }, -@@ -14503,8 +16541,9 @@ +@@ -14503,7 +17974,9 @@ } }, "node_modules/style-loader": { - "version": "3.3.3", -- "license": "MIT", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz", + "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==", + "license": "MIT", "engines": { "node": ">= 12.13.0" - }, -@@ -14518,13 +16557,15 @@ +@@ -14518,11 +17991,15 @@ }, "node_modules/style-search": { "version": "0.1.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", + "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/stylelint": { "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", -@@ -14580,8 +16621,9 @@ +@@ -14580,6 +18057,8 @@ }, "node_modules/stylelint-config-html": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz", + "integrity": "sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": "^12 || >=14" - }, -@@ -14595,8 +16637,9 @@ +@@ -14595,6 +18074,8 @@ }, "node_modules/stylelint-config-recommended": { "version": "13.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz", + "integrity": "sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": "^14.13.1 || >=16.0.0" - }, -@@ -14606,8 +16649,9 @@ +@@ -14606,6 +18087,8 @@ }, "node_modules/stylelint-config-recommended-vue": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.5.0.tgz", + "integrity": "sha512-65TAK/clUqkNtkZLcuytoxU0URQYlml+30Nhop7sRkCZ/mtWdXt7T+spPSB3KMKlb+82aEVJ4OrcstyDBdbosg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "semver": "^7.3.5", - "stylelint-config-html": ">=1.0.0", -@@ -14624,24 +16668,11 @@ +@@ -14624,24 +18107,12 @@ "stylelint": ">=14.0.0" } }, @@ -19702,14 +19546,14 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -14649,15 +16680,33 @@ +@@ -14649,13 +18120,33 @@ "node": ">=10" } }, @@ -19731,6 +19575,7 @@ index a38125e..a1067b0 100644 + "url": "https://github.com/sponsors/stylelint" + } + ], ++ "license": "MIT", + "engines": { + "node": ">=18.12.0" + }, @@ -19743,11 +19588,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-34.0.0.tgz", + "integrity": "sha512-u0VSZnVyW9VSryBG2LSO+OQTjN7zF9XJaAJRX/4EwkmU0R2jYwmBSN10acqZisDitS0CLiEiGjX7+Hrq8TAhfQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "stylelint-config-recommended": "^13.0.0" - }, -@@ -14669,9 +16718,10 @@ +@@ -14669,7 +18160,9 @@ } }, "node_modules/stylelint-scss": { @@ -19756,107 +19599,88 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.3.2.tgz", + "integrity": "sha512-4LzLaayFhFyneJwLo0IUa8knuIvj+zF0vBFueQs4e3tEaAMIQX8q5th8ziKkgOavr6y/y9yoBe+RXN/edwLzsQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "known-css-properties": "^0.29.0", - "postcss-media-query-parser": "^0.2.3", -@@ -14685,13 +16735,15 @@ +@@ -14685,11 +18178,15 @@ }, "node_modules/stylelint/node_modules/balanced-match": { "version": "2.0.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/stylelint/node_modules/camelcase": { "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=10" - }, -@@ -14701,8 +16753,9 @@ +@@ -14701,6 +18198,8 @@ }, "node_modules/stylelint/node_modules/camelcase-keys": { "version": "7.0.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz", + "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "camelcase": "^6.3.0", - "map-obj": "^4.1.0", -@@ -14718,8 +16771,9 @@ +@@ -14718,6 +18217,8 @@ }, "node_modules/stylelint/node_modules/cosmiconfig": { "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", -@@ -14743,8 +16797,9 @@ +@@ -14743,6 +18244,8 @@ }, "node_modules/stylelint/node_modules/decamelize": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz", + "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=10" - }, -@@ -14754,8 +16809,9 @@ +@@ -14754,6 +18257,8 @@ }, "node_modules/stylelint/node_modules/file-entry-cache": { "version": "7.0.2", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.2.tgz", + "integrity": "sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "flat-cache": "^3.2.0" - }, -@@ -14765,8 +16821,9 @@ +@@ -14765,6 +18270,8 @@ }, "node_modules/stylelint/node_modules/find-up": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" -@@ -14780,8 +16837,9 @@ +@@ -14780,6 +18287,8 @@ }, "node_modules/stylelint/node_modules/indent-string": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=12" - }, -@@ -14791,8 +16849,9 @@ +@@ -14791,6 +18300,8 @@ }, "node_modules/stylelint/node_modules/locate-path": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-locate": "^5.0.0" - }, -@@ -14803,21 +16862,11 @@ +@@ -14803,19 +18314,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, @@ -19876,98 +19700,81 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz", + "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/minimist": "^1.2.2", - "camelcase-keys": "^7.0.0", -@@ -14841,8 +16890,9 @@ +@@ -14841,6 +18343,8 @@ }, "node_modules/stylelint/node_modules/normalize-package-data": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", -@@ -14855,8 +16905,9 @@ +@@ -14855,6 +18359,8 @@ }, "node_modules/stylelint/node_modules/p-limit": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "yocto-queue": "^0.1.0" - }, -@@ -14869,8 +16920,9 @@ +@@ -14869,6 +18375,8 @@ }, "node_modules/stylelint/node_modules/p-locate": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "p-limit": "^3.0.2" - }, -@@ -14883,8 +16935,9 @@ +@@ -14883,6 +18391,8 @@ }, "node_modules/stylelint/node_modules/parse-json": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", -@@ -14900,16 +16953,18 @@ +@@ -14900,6 +18410,8 @@ }, "node_modules/stylelint/node_modules/path-exists": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -14908,6 +18420,8 @@ }, "node_modules/stylelint/node_modules/read-pkg": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz", + "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^3.0.2", -@@ -14925,8 +16980,9 @@ +@@ -14925,6 +18439,8 @@ }, "node_modules/stylelint/node_modules/read-pkg-up": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz", + "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "find-up": "^5.0.0", - "read-pkg": "^6.0.0", -@@ -14941,8 +16997,9 @@ +@@ -14941,6 +18457,8 @@ }, "node_modules/stylelint/node_modules/redent": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz", + "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "indent-string": "^5.0.0", - "strip-indent": "^4.0.0" -@@ -14954,21 +17011,11 @@ +@@ -14954,21 +18472,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, @@ -19985,60 +19792,52 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -14978,8 +17025,9 @@ +@@ -14978,6 +18487,8 @@ }, "node_modules/stylelint/node_modules/strip-indent": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz", + "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "min-indent": "^1.0.1" - }, -@@ -14992,8 +17040,9 @@ +@@ -14992,6 +18503,8 @@ }, "node_modules/stylelint/node_modules/trim-newlines": { "version": "4.1.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz", + "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=12" - }, -@@ -15003,8 +17052,9 @@ +@@ -15003,6 +18516,8 @@ }, "node_modules/stylelint/node_modules/type-fest": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", "dev": true, -- "license": "(MIT OR CC0-1.0)", + "license": "(MIT OR CC0-1.0)", "engines": { - "node": ">=10" - }, -@@ -15013,9 +17063,10 @@ +@@ -15013,7 +18528,9 @@ } }, "node_modules/stylelint/node_modules/typescript": { - "version": "5.3.2", -+ "version": "5.5.4", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", -+ "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", ++ "version": "5.6.3", ++ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", ++ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "optional": true, - "peer": true, - "bin": { -@@ -15026,14 +17077,31 @@ +@@ -15026,13 +18543,33 @@ "node": ">=14.17" } }, @@ -20048,7 +19847,9 @@ index a38125e..a1067b0 100644 + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", -+ "dev": true, + "dev": true, +- "license": "ISC" ++ "license": "ISC", + "engines": { + "node": ">=10" + } @@ -20057,8 +19858,8 @@ index a38125e..a1067b0 100644 + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, -- "license": "ISC" ++ "dev": true, ++ "license": "MIT", + "engines": { + "node": ">=10" + }, @@ -20068,23 +19869,21 @@ index a38125e..a1067b0 100644 }, "node_modules/sumchecker": { "version": "3.0.1", -- "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", + "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "license": "Apache-2.0", "dependencies": { "debug": "^4.1.0" - }, -@@ -15043,7 +17111,8 @@ +@@ -15043,6 +18580,8 @@ }, "node_modules/supports-color": { "version": "7.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" - }, -@@ -15052,20 +17121,25 @@ +@@ -15052,7 +18591,9 @@ } }, "node_modules/supports-hyperlinks": { @@ -20093,10 +19892,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz", + "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" +@@ -15061,10 +18602,15 @@ }, "engines": { "node": ">=14.18" @@ -20107,13 +19905,12 @@ index a38125e..a1067b0 100644 }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", "engines": { "node": ">= 0.4" - }, -@@ -15075,12 +17149,15 @@ +@@ -15075,10 +18621,14 @@ }, "node_modules/svg-tags": { "version": "1.0.0", @@ -20127,11 +19924,9 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", + "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", "dev": true, -- "license": "BSD-3-Clause", + "license": "BSD-3-Clause", "dependencies": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", -@@ -15092,30 +17169,11 @@ +@@ -15092,28 +18642,10 @@ "node": ">=10.0.0" } }, @@ -20160,140 +19955,123 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", -@@ -15130,15 +17188,17 @@ +@@ -15130,6 +18662,8 @@ }, "node_modules/tapable": { "version": "2.2.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "license": "MIT", "engines": { "node": ">=6" - } +@@ -15137,6 +18671,8 @@ }, "node_modules/tar": { "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, -- "license": "ISC", + "license": "ISC", "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", -@@ -15153,7 +17213,8 @@ +@@ -15153,6 +18689,8 @@ }, "node_modules/tar-fs": { "version": "2.1.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "license": "MIT", "dependencies": { "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", -@@ -15163,11 +17224,13 @@ +@@ -15163,10 +18701,14 @@ }, "node_modules/tar-fs/node_modules/chownr": { "version": "1.1.4", -- "license": "ISC" + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", -+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" ++ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" }, "node_modules/tar-stream": { "version": "2.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "dependencies": { "bl": "^4.0.3", - "end-of-stream": "^1.4.1", -@@ -15181,8 +17244,9 @@ +@@ -15181,6 +18723,8 @@ }, "node_modules/tar/node_modules/mkdirp": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "mkdirp": "bin/cmd.js" - }, -@@ -15192,13 +17256,15 @@ +@@ -15192,11 +18736,15 @@ }, "node_modules/tar/node_modules/yallist": { "version": "4.0.0", -- "dev": true, -- "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -+ "dev": true + "dev": true, + "license": "ISC" }, "node_modules/temp-file": { "version": "3.4.0", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", + "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "async-exit-hook": "^2.0.1", - "fs-extra": "^10.0.0" -@@ -15206,8 +17272,9 @@ +@@ -15206,6 +18754,8 @@ }, "node_modules/temp-file/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", -@@ -15219,8 +17286,9 @@ +@@ -15219,6 +18769,8 @@ }, "node_modules/temp-file/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "universalify": "^2.0.0" - }, -@@ -15230,15 +17298,17 @@ +@@ -15230,6 +18782,8 @@ }, "node_modules/temp-file/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 10.0.0" +@@ -15237,7 +18791,9 @@ } }, "node_modules/terser": { - "version": "5.31.0", -- "license": "BSD-2-Clause", -+ "version": "5.31.6", -+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", -+ "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", ++ "version": "5.36.0", ++ "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz", ++ "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==", + "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", -@@ -15254,7 +17324,8 @@ +@@ -15254,6 +18810,8 @@ }, "node_modules/terser-webpack-plugin": { "version": "5.3.10", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.20", - "jest-worker": "^27.4.5", -@@ -15284,9 +17355,38 @@ +@@ -15284,8 +18842,41 @@ } } }, @@ -20301,6 +20079,7 @@ index a38125e..a1067b0 100644 + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", ++ "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", @@ -20316,6 +20095,7 @@ index a38125e..a1067b0 100644 + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ++ "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } @@ -20323,35 +20103,34 @@ index a38125e..a1067b0 100644 + "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", ++ "license": "MIT" + }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { "version": "3.3.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", -@@ -15301,8 +17401,9 @@ +@@ -15301,7 +18892,9 @@ } }, "node_modules/terser/node_modules/acorn": { - "version": "8.11.2", -- "license": "MIT", -+ "version": "8.12.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", -+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", ++ "version": "8.13.0", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", ++ "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", + "license": "MIT", "bin": { "acorn": "bin/acorn" - }, -@@ -15312,43 +17413,53 @@ +@@ -15312,28 +18905,41 @@ }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", -+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" ++ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "license": "MIT" }, "node_modules/text-extensions": { - "version": "1.9.0", @@ -20359,7 +20138,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz", + "integrity": "sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.10" + "node": ">=8" @@ -20370,144 +20149,137 @@ index a38125e..a1067b0 100644 }, "node_modules/text-table": { "version": "0.2.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/through": { "version": "2.3.8", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/through2": { "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "readable-stream": "3" - } +@@ -15342,11 +18948,22 @@ }, "node_modules/thunky": { "version": "1.1.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", -+ "dev": true ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/tinyexec": { ++ "version": "0.3.1", ++ "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.1.tgz", ++ "integrity": "sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==", + "dev": true, + "license": "MIT" }, "node_modules/tmp": { "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "os-tmpdir": "~1.0.2" - }, -@@ -15358,30 +17469,34 @@ +@@ -15358,6 +18975,8 @@ }, "node_modules/tmp-promise": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "tmp": "^0.2.0" - } +@@ -15366,6 +18985,8 @@ }, "node_modules/tmp-promise/node_modules/tmp": { "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=14.14" - } +@@ -15374,6 +18995,8 @@ }, "node_modules/to-fast-properties": { "version": "2.0.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "license": "MIT", "engines": { "node": ">=4" - } +@@ -15381,6 +19004,8 @@ }, "node_modules/to-regex-range": { "version": "5.0.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", "dependencies": { "is-number": "^7.0.0" - }, -@@ -15391,43 +17506,49 @@ +@@ -15391,6 +19016,8 @@ }, "node_modules/toidentifier": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=0.6" - } +@@ -15399,11 +19026,15 @@ }, "node_modules/tr46": { "version": "0.0.3", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/tree-kill": { "version": "1.2.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "license": "MIT", "bin": { "tree-kill": "cli.js" - } +@@ -15411,6 +19042,8 @@ }, "node_modules/trim-newlines": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=8" - } +@@ -15419,6 +19052,8 @@ }, "node_modules/truncate-utf8-bytes": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", "dev": true, -- "license": "WTFPL", + "license": "WTFPL", "dependencies": { - "utf8-byte-length": "^1.0.1" - } +@@ -15427,6 +19062,8 @@ }, "node_modules/ts-loader": { "version": "9.2.9", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.9.tgz", + "integrity": "sha512-b0+vUY2/enb0qYtDQuNlDnJ9900NTiPiJcDJ6sY7ax1CCCwXfYIqPOMm/BwW7jsF1km+Oz8W9s31HLuD+FLIMg==", + "license": "MIT", "dependencies": { "chalk": "^4.1.0", - "enhanced-resolve": "^5.0.0", -@@ -15442,22 +17563,10 @@ +@@ -15442,22 +19079,11 @@ "webpack": "^5.0.0" } }, @@ -20523,17 +20295,17 @@ index a38125e..a1067b0 100644 - }, "node_modules/ts-loader/node_modules/semver": { - "version": "7.5.4", -- "license": "ISC", -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, "bin": { "semver": "bin/semver.js" }, -@@ -15465,14 +17574,11 @@ +@@ -15465,12 +19091,10 @@ "node": ">=10" } }, @@ -20547,24 +20319,20 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", -@@ -15512,9 +17618,10 @@ +@@ -15512,7 +19136,9 @@ } }, "node_modules/ts-node/node_modules/acorn": { - "version": "8.11.2", -+ "version": "8.12.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", -+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", ++ "version": "8.13.0", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", ++ "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "acorn": "bin/acorn" - }, -@@ -15523,9 +17630,10 @@ +@@ -15523,7 +19149,9 @@ } }, "node_modules/tsconfig-paths": { @@ -20573,97 +20341,84 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.2", -@@ -15535,8 +17643,9 @@ +@@ -15535,6 +19163,8 @@ }, "node_modules/tsconfig-paths/node_modules/json5": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "minimist": "^1.2.0" - }, -@@ -15545,13 +17654,15 @@ +@@ -15545,11 +19175,15 @@ } }, "node_modules/tslib": { - "version": "2.6.2", -- "license": "0BSD" -+ "version": "2.7.0", -+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", -+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" ++ "version": "2.8.0", ++ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz", ++ "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==", + "license": "0BSD" }, "node_modules/tsutils": { "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "tslib": "^1.8.1" - }, -@@ -15564,12 +17675,14 @@ +@@ -15564,11 +19198,15 @@ }, "node_modules/tsutils/node_modules/tslib": { "version": "1.14.1", -- "dev": true, -- "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", -+ "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/tunnel-agent": { "version": "0.6.0", -- "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "license": "Apache-2.0", "dependencies": { "safe-buffer": "^5.0.1" - }, -@@ -15579,12 +17692,14 @@ +@@ -15579,10 +19217,14 @@ }, "node_modules/tweetnacl": { "version": "0.14.5", -- "license": "Unlicense" + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", -+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" ++ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "license": "Unlicense" }, "node_modules/type-check": { "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "prelude-ls": "^1.2.1" - }, -@@ -15594,7 +17709,8 @@ +@@ -15594,6 +19236,8 @@ }, "node_modules/type-fest": { "version": "2.19.0", -- "license": "(MIT OR CC0-1.0)", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=12.20" - }, -@@ -15604,8 +17720,9 @@ +@@ -15604,6 +19248,8 @@ }, "node_modules/type-is": { "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" -@@ -15615,27 +17732,30 @@ +@@ -15615,27 +19261,32 @@ } }, "node_modules/typed-array-buffer": { @@ -20672,7 +20427,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", @@ -20691,7 +20446,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", @@ -20704,7 +20459,7 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -15645,15 +17765,17 @@ +@@ -15645,15 +19296,18 @@ } }, "node_modules/typed-array-byte-offset": { @@ -20713,7 +20468,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", @@ -20728,7 +20483,7 @@ index a38125e..a1067b0 100644 }, "engines": { "node": ">= 0.4" -@@ -15663,13 +17785,20 @@ +@@ -15663,13 +19317,21 @@ } }, "node_modules/typed-array-length": { @@ -20737,7 +20492,7 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", @@ -20753,355 +20508,337 @@ index a38125e..a1067b0 100644 }, "funding": { "url": "https://github.com/sponsors/ljharb" -@@ -15677,12 +17806,14 @@ +@@ -15677,11 +19339,15 @@ }, "node_modules/typedarray": { "version": "0.0.6", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/typescript": { "version": "4.6.4", -- "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", - "tsserver": "bin/tsserver" -@@ -15692,9 +17823,10 @@ +@@ -15692,7 +19358,9 @@ } }, "node_modules/uglify-js": { - "version": "3.17.4", -+ "version": "3.19.2", -+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz", -+ "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==", ++ "version": "3.19.3", ++ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", ++ "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" -@@ -15705,8 +17837,9 @@ +@@ -15705,6 +19373,8 @@ }, "node_modules/unbox-primitive": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", -@@ -15719,20 +17852,24 @@ +@@ -15719,10 +19389,15 @@ }, "node_modules/undici-types": { "version": "5.26.5", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", -+ "dev": true ++ "dev": true, + "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", +- "version": "2.0.0", ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz", ++ "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" - } +@@ -15731,6 +19406,8 @@ }, "node_modules/unicode-match-property-ecmascript": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "unicode-canonical-property-names-ecmascript": "^2.0.0", - "unicode-property-aliases-ecmascript": "^2.0.0" -@@ -15743,24 +17880,27 @@ +@@ -15742,7 +19419,9 @@ + } }, "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", -+ "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", +- "version": "2.1.0", ++ "version": "2.2.0", ++ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz", ++ "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" - } +@@ -15751,6 +19430,8 @@ }, "node_modules/unicode-property-aliases-ecmascript": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", + "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=4" - } +@@ -15759,6 +19440,8 @@ }, "node_modules/unicorn-magic": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">=18" - }, -@@ -15770,22 +17910,25 @@ +@@ -15770,6 +19453,8 @@ }, "node_modules/universalify": { "version": "0.1.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "license": "MIT", "engines": { "node": ">= 4.0.0" - } +@@ -15777,6 +19462,8 @@ }, "node_modules/unpipe": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.8" - } +@@ -15785,6 +19472,8 @@ }, "node_modules/unzip-crx-3": { "version": "0.2.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz", + "integrity": "sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==", + "license": "MIT", "dependencies": { "jszip": "^3.1.0", - "mkdirp": "^0.5.1", -@@ -15793,7 +17936,9 @@ +@@ -15793,7 +19482,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.13", -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", -+ "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", ++ "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "funding": [ { "type": "opencollective", -@@ -15808,10 +17953,9 @@ - "url": "https://github.com/sponsors/ai" - } +@@ -15810,8 +19501,8 @@ ], -- "license": "MIT", + "license": "MIT", "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" -+ "escalade": "^3.1.2", -+ "picocolors": "^1.0.1" ++ "escalade": "^3.2.0", ++ "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" -@@ -15822,58 +17966,68 @@ +@@ -15822,6 +19513,8 @@ }, "node_modules/uri-js": { "version": "4.4.1", -- "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" - } +@@ -15829,19 +19522,27 @@ }, "node_modules/utf8-byte-length": { "version": "1.0.5", -- "dev": true, -- "license": "(WTFPL OR MIT)" + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz", + "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==", -+ "dev": true + "dev": true, + "license": "(WTFPL OR MIT)" }, "node_modules/util-deprecate": { "version": "1.0.2", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" ++ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" }, "node_modules/utila": { "version": "0.4.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", -+ "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==" ++ "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", + "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { - "node": ">= 0.4.0" - } +@@ -15850,6 +19551,8 @@ }, "node_modules/uuid": { "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "uuid": "dist/bin/uuid" - } +@@ -15858,20 +19561,28 @@ }, "node_modules/v-mask": { "version": "2.3.0", -- "license": "MIT" + "resolved": "https://registry.npmjs.org/v-mask/-/v-mask-2.3.0.tgz", -+ "integrity": "sha512-ap7pTtCTvj25CqX4VYXqudCBd0+XvYyhiiLbzWQQR7AMQosJ2+DPu0a94P9stk0EGmGcmYxJaPkFkfjD8hquWQ==" ++ "integrity": "sha512-ap7pTtCTvj25CqX4VYXqudCBd0+XvYyhiiLbzWQQR7AMQosJ2+DPu0a94P9stk0EGmGcmYxJaPkFkfjD8hquWQ==", + "license": "MIT" }, "node_modules/v8-compile-cache": { "version": "2.4.0", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", -- "dev": true, -- "license": "MIT" + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", -+ "dev": true + "dev": true, + "license": "MIT" }, "node_modules/validate-npm-package-license": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" -@@ -15881,22 +18035,38 @@ +@@ -15881,34 +19592,55 @@ }, "node_modules/vary": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true, -- "license": "MIT", + "license": "MIT", "engines": { "node": ">= 0.8" } }, +- "node_modules/vue": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz", +- "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==", + "node_modules/verror": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", + "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", + "dev": true, ++ "license": "MIT", + "optional": true, -+ "dependencies": { -+ "assert-plus": "^1.0.0", -+ "core-util-is": "1.0.2", -+ "extsprintf": "^1.2.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, - "node_modules/vue": { -- "version": "3.4.27", -- "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz", -- "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==", -+ "version": "3.4.38", -+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.38.tgz", -+ "integrity": "sha512-f0ZgN+mZ5KFgVv9wz0f4OgVKukoXtS3nwET4c2vLBGQR50aI8G0cqbFtLlX9Yiyg3LFGBitruPHt2PxwTduJEw==", "dependencies": { - "@vue/compiler-dom": "3.4.27", - "@vue/compiler-sfc": "3.4.27", - "@vue/runtime-dom": "3.4.27", - "@vue/server-renderer": "3.4.27", - "@vue/shared": "3.4.27" +- }, +- "peerDependencies": { +- "typescript": "*" ++ "assert-plus": "^1.0.0", ++ "core-util-is": "1.0.2", ++ "extsprintf": "^1.2.0" + }, +- "peerDependenciesMeta": { +- "typescript": { ++ "engines": { ++ "node": ">=0.6.0" ++ } ++ }, ++ "node_modules/vue": { ++ "version": "3.4.38", ++ "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.38.tgz", ++ "integrity": "sha512-f0ZgN+mZ5KFgVv9wz0f4OgVKukoXtS3nwET4c2vLBGQR50aI8G0cqbFtLlX9Yiyg3LFGBitruPHt2PxwTduJEw==", ++ "license": "MIT", ++ "dependencies": { + "@vue/compiler-dom": "3.4.38", + "@vue/compiler-sfc": "3.4.38", + "@vue/runtime-dom": "3.4.38", + "@vue/server-renderer": "3.4.38", + "@vue/shared": "3.4.38" - }, - "peerDependencies": { - "typescript": "*" -@@ -15909,8 +18079,9 @@ ++ }, ++ "peerDependencies": { ++ "typescript": "*" ++ }, ++ "peerDependenciesMeta": { ++ "typescript": { + "optional": true + } + } }, "node_modules/vue-eslint-parser": { "version": "8.3.0", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz", + "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "debug": "^4.3.2", - "eslint-scope": "^7.0.0", -@@ -15931,9 +18102,10 @@ +@@ -15931,7 +19663,9 @@ } }, "node_modules/vue-eslint-parser/node_modules/acorn": { - "version": "8.11.2", -+ "version": "8.12.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", -+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", ++ "version": "8.13.0", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", ++ "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", "dev": true, -- "license": "MIT", + "license": "MIT", "bin": { - "acorn": "bin/acorn" - }, -@@ -15943,8 +18115,9 @@ +@@ -15943,6 +19677,8 @@ }, "node_modules/vue-eslint-parser/node_modules/eslint-scope": { "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" -@@ -15958,8 +18131,9 @@ +@@ -15958,6 +19694,8 @@ }, "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": { "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, -- "license": "Apache-2.0", + "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, -@@ -15969,8 +18143,9 @@ +@@ -15969,6 +19707,8 @@ }, "node_modules/vue-eslint-parser/node_modules/espree": { "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", -@@ -15985,30 +18160,18 @@ +@@ -15985,30 +19725,20 @@ }, "node_modules/vue-eslint-parser/node_modules/estraverse": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, -- "license": "BSD-2-Clause", + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -21123,14 +20860,14 @@ index a38125e..a1067b0 100644 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, -- "license": "ISC", + "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, -@@ -16016,11 +18179,6 @@ +@@ -16016,15 +19746,11 @@ "node": ">=10" } }, @@ -21142,23 +20879,27 @@ index a38125e..a1067b0 100644 "node_modules/vue-i18n": { "version": "9.13.1", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.13.1.tgz", -@@ -16042,7 +18200,8 @@ + "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==", ++ "license": "MIT", + "dependencies": { + "@intlify/core-base": "9.13.1", + "@intlify/shared": "9.13.1", +@@ -16042,6 +19768,8 @@ }, "node_modules/vue-loader": { "version": "16.8.3", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "license": "MIT", "dependencies": { "chalk": "^4.1.0", - "hash-sum": "^2.0.0", -@@ -16054,73 +18213,75 @@ +@@ -16054,72 +19782,82 @@ }, "node_modules/vue-resize": { "version": "2.0.0-alpha.1", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz", + "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==", + "license": "MIT", "peerDependencies": { "vue": "^3.0.0" } @@ -21170,6 +20911,7 @@ index a38125e..a1067b0 100644 + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.38.tgz", + "integrity": "sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==", ++ "license": "MIT", "dependencies": { - "@babel/parser": "^7.24.4", - "@vue/shared": "3.4.27", @@ -21187,6 +20929,7 @@ index a38125e..a1067b0 100644 + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz", + "integrity": "sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==", ++ "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.4.27", - "@vue/shared": "3.4.27" @@ -21207,6 +20950,7 @@ index a38125e..a1067b0 100644 + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.38.tgz", + "integrity": "sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==", ++ "license": "MIT", + "dependencies": { + "@babel/parser": "^7.24.7", + "@vue/compiler-core": "3.4.38", @@ -21227,6 +20971,7 @@ index a38125e..a1067b0 100644 + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.38.tgz", + "integrity": "sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==", ++ "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.4.27", - "@vue/shared": "3.4.27" @@ -21240,15 +20985,17 @@ index a38125e..a1067b0 100644 - "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", -+ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==" ++ "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==", ++ "license": "MIT" }, "node_modules/vue/node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", -+ "version": "0.30.11", -+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", -+ "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", ++ "version": "0.30.12", ++ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz", ++ "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==", ++ "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" + "@jridgewell/sourcemap-codec": "^1.5.0" @@ -21256,50 +21003,46 @@ index a38125e..a1067b0 100644 }, "node_modules/vuedraggable": { "version": "4.1.0", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "license": "MIT", "dependencies": { "sortablejs": "1.14.0" - }, -@@ -16129,8 +18290,9 @@ +@@ -16129,7 +19867,9 @@ } }, "node_modules/watchpack": { - "version": "2.4.1", -- "license": "MIT", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", + "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" -@@ -16141,31 +18303,33 @@ +@@ -16141,6 +19881,8 @@ }, "node_modules/wbuf": { "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, -- "license": "MIT", + "license": "MIT", "dependencies": { - "minimalistic-assert": "^1.0.0" - } +@@ -16149,23 +19891,26 @@ }, "node_modules/webidl-conversions": { "version": "3.0.1", -- "dev": true, -- "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", -+ "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/webpack": { - "version": "5.91.0", -- "license": "MIT", -+ "version": "5.94.0", -+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", -+ "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", ++ "version": "5.95.0", ++ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz", ++ "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==", + "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", @@ -21316,154 +21059,48 @@ index a38125e..a1067b0 100644 "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", -@@ -16199,7 +18363,8 @@ +@@ -16199,6 +19944,8 @@ }, "node_modules/webpack-cli": { "version": "4.9.2", -- "license": "MIT", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", + "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", + "license": "MIT", "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.1", -@@ -16220,35 +18385,113 @@ - "engines": { - "node": ">=10.13.0" - }, -- "peerDependencies": { -- "webpack": "4.x.x || 5.x.x" -+ "peerDependencies": { -+ "webpack": "4.x.x || 5.x.x" -+ }, -+ "peerDependenciesMeta": { -+ "@webpack-cli/generators": { -+ "optional": true -+ }, -+ "@webpack-cli/migrate": { -+ "optional": true -+ }, -+ "webpack-bundle-analyzer": { -+ "optional": true -+ }, -+ "webpack-dev-server": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/webpack-cli/node_modules/commander": { -+ "version": "7.2.0", +@@ -16240,10812 +19987,147 @@ + }, + "node_modules/webpack-cli/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/webpack-cli/node_modules/execa": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", -+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", -+ "dependencies": { -+ "cross-spawn": "^7.0.3", -+ "get-stream": "^6.0.0", -+ "human-signals": "^2.1.0", -+ "is-stream": "^2.0.0", -+ "merge-stream": "^2.0.0", -+ "npm-run-path": "^4.0.1", -+ "onetime": "^5.1.2", -+ "signal-exit": "^3.0.3", -+ "strip-final-newline": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sindresorhus/execa?sponsor=1" -+ } -+ }, -+ "node_modules/webpack-cli/node_modules/get-stream": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", -+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/webpack-cli/node_modules/human-signals": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", -+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", -+ "engines": { -+ "node": ">=10.17.0" -+ } -+ }, -+ "node_modules/webpack-cli/node_modules/is-stream": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", -+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/webpack-cli/node_modules/npm-run-path": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", -+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", -+ "dependencies": { -+ "path-key": "^3.0.0" - }, -- "peerDependenciesMeta": { -- "@webpack-cli/generators": { -- "optional": true -- }, -- "@webpack-cli/migrate": { -- "optional": true -- }, -- "webpack-bundle-analyzer": { -- "optional": true -- }, -- "webpack-dev-server": { -- "optional": true -- } -+ "engines": { -+ "node": ">=8" - } - }, -- "node_modules/webpack-cli/node_modules/commander": { -- "version": "7.2.0", -- "license": "MIT", -+ "node_modules/webpack-cli/node_modules/signal-exit": { -+ "version": "3.0.7", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" -+ }, -+ "node_modules/webpack-cli/node_modules/strip-final-newline": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", -+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "license": "MIT", "engines": { -- "node": ">= 10" -+ "node": ">=6" + "node": ">= 10" } }, - "node_modules/webpack-dev-middleware": { - "version": "5.3.4", -+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", -+ "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", - "dev": true, +- "node_modules/webpack-dev-middleware": { +- "version": "5.3.4", +- "dev": true, - "license": "MIT", - "dependencies": { - "colorette": "^2.0.10", - "memfs": "^3.4.3", -@@ -16267,41 +18510,11 @@ - "webpack": "^4.0.0 || ^5.0.0" - } - }, +- "dependencies": { +- "colorette": "^2.0.10", +- "memfs": "^3.4.3", +- "mime-types": "^2.1.31", +- "range-parser": "^1.2.1", +- "schema-utils": "^4.0.0" +- }, +- "engines": { +- "node": ">= 12.13.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/webpack" +- }, +- "peerDependencies": { +- "webpack": "^4.0.0 || ^5.0.0" +- } +- }, - "node_modules/webpack-dev-middleware/node_modules/ajv": { - "version": "8.12.0", - "dev": true, @@ -21495,30 +21132,78 @@ index a38125e..a1067b0 100644 - "dev": true, - "license": "MIT" - }, - "node_modules/webpack-dev-middleware/node_modules/schema-utils": { - "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", -+ "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", - "dev": true, +- "node_modules/webpack-dev-middleware/node_modules/schema-utils": { +- "version": "4.2.0", +- "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.9.0", -@@ -16318,8 +18531,9 @@ - }, - "node_modules/webpack-dev-server": { - "version": "4.11.1", -+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", -+ "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", - "dev": true, +- "dependencies": { +- "@types/json-schema": "^7.0.9", +- "ajv": "^8.9.0", +- "ajv-formats": "^2.1.1", +- "ajv-keywords": "^5.1.0" +- }, +- "engines": { +- "node": ">= 12.13.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/webpack" +- } +- }, +- "node_modules/webpack-dev-server": { +- "version": "4.11.1", +- "dev": true, - "license": "MIT", - "dependencies": { - "@types/bonjour": "^3.5.9", - "@types/connect-history-api-fallback": "^1.3.5", -@@ -16370,41 +18584,11 @@ - } - } - }, +- "dependencies": { +- "@types/bonjour": "^3.5.9", +- "@types/connect-history-api-fallback": "^1.3.5", +- "@types/express": "^4.17.13", +- "@types/serve-index": "^1.9.1", +- "@types/serve-static": "^1.13.10", +- "@types/sockjs": "^0.3.33", +- "@types/ws": "^8.5.1", +- "ansi-html-community": "^0.0.8", +- "bonjour-service": "^1.0.11", +- "chokidar": "^3.5.3", +- "colorette": "^2.0.10", +- "compression": "^1.7.4", +- "connect-history-api-fallback": "^2.0.0", +- "default-gateway": "^6.0.3", +- "express": "^4.17.3", +- "graceful-fs": "^4.2.6", +- "html-entities": "^2.3.2", +- "http-proxy-middleware": "^2.0.3", +- "ipaddr.js": "^2.0.1", +- "open": "^8.0.9", +- "p-retry": "^4.5.0", +- "rimraf": "^3.0.2", +- "schema-utils": "^4.0.0", +- "selfsigned": "^2.1.1", +- "serve-index": "^1.9.1", +- "sockjs": "^0.3.24", +- "spdy": "^4.0.2", +- "webpack-dev-middleware": "^5.3.1", +- "ws": "^8.4.2" +- }, +- "bin": { +- "webpack-dev-server": "bin/webpack-dev-server.js" +- }, +- "engines": { +- "node": ">= 12.13.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/webpack" +- }, +- "peerDependencies": { +- "webpack": "^4.37.0 || ^5.0.0" +- }, +- "peerDependenciesMeta": { +- "webpack-cli": { +- "optional": true +- } +- } +- }, - "node_modules/webpack-dev-server/node_modules/ajv": { - "version": "8.12.0", - "dev": true, @@ -21550,281 +21235,259 @@ index a38125e..a1067b0 100644 - "dev": true, - "license": "MIT" - }, - "node_modules/webpack-dev-server/node_modules/schema-utils": { - "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", -+ "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", - "dev": true, -- "license": "MIT", +- "node_modules/webpack-dev-server/node_modules/schema-utils": { +- "version": "4.2.0", +- "dev": true, ++ "node_modules/webpack-cli/node_modules/execa": { ++ "version": "5.1.1", ++ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", ++ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "license": "MIT", "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.9.0", -@@ -16421,7 +18605,8 @@ - }, - "node_modules/webpack-merge": { - "version": "5.10.0", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", -+ "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", - "dependencies": { - "clone-deep": "^4.0.1", - "flat": "^5.0.2", -@@ -16433,14 +18618,16 @@ - }, - "node_modules/webpack-sources": { - "version": "3.2.3", -- "license": "MIT", -+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", -+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", +- "@types/json-schema": "^7.0.9", +- "ajv": "^8.9.0", +- "ajv-formats": "^2.1.1", +- "ajv-keywords": "^5.1.0" ++ "cross-spawn": "^7.0.3", ++ "get-stream": "^6.0.0", ++ "human-signals": "^2.1.0", ++ "is-stream": "^2.0.0", ++ "merge-stream": "^2.0.0", ++ "npm-run-path": "^4.0.1", ++ "onetime": "^5.1.2", ++ "signal-exit": "^3.0.3", ++ "strip-final-newline": "^2.0.0" + }, "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/webpack/node_modules/acorn": { +- "node": ">= 12.13.0" ++ "node": ">=10" + }, + "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/webpack" +- } +- }, +- "node_modules/webpack-merge": { +- "version": "5.10.0", +- "license": "MIT", +- "dependencies": { +- "clone-deep": "^4.0.1", +- "flat": "^5.0.2", +- "wildcard": "^2.0.0" +- }, +- "engines": { +- "node": ">=10.0.0" +- } +- }, +- "node_modules/webpack-sources": { +- "version": "3.2.3", +- "license": "MIT", +- "engines": { +- "node": ">=10.13.0" +- } +- }, +- "node_modules/webpack/node_modules/acorn": { - "version": "8.11.2", - "license": "MIT", -+ "version": "8.12.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", -+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "bin": { - "acorn": "bin/acorn" - }, -@@ -16448,16 +18635,46 @@ - "node": ">=0.4.0" - } - }, +- "bin": { +- "acorn": "bin/acorn" +- }, +- "engines": { +- "node": ">=0.4.0" +- } +- }, - "node_modules/webpack/node_modules/acorn-import-assertions": { - "version": "1.9.0", - "license": "MIT", -+ "node_modules/webpack/node_modules/acorn-import-attributes": { -+ "version": "1.9.5", -+ "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", -+ "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", - "peerDependencies": { - "acorn": "^8" - } - }, -+ "node_modules/webpack/node_modules/ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -+ "dependencies": { -+ "fast-deep-equal": "^3.1.1", -+ "fast-json-stable-stringify": "^2.0.0", -+ "json-schema-traverse": "^0.4.1", -+ "uri-js": "^4.2.2" -+ }, -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/epoberezkin" -+ } -+ }, -+ "node_modules/webpack/node_modules/ajv-keywords": { -+ "version": "3.5.2", -+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", -+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", -+ "peerDependencies": { -+ "ajv": "^6.9.1" -+ } -+ }, -+ "node_modules/webpack/node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -+ }, - "node_modules/webpack/node_modules/schema-utils": { - "version": "3.3.0", +- "peerDependencies": { +- "acorn": "^8" +- } +- }, +- "node_modules/webpack/node_modules/schema-utils": { +- "version": "3.3.0", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", -+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", -@@ -16473,8 +18690,9 @@ - }, - "node_modules/websocket-driver": { - "version": "0.7.4", -+ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", -+ "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, +- "dependencies": { +- "@types/json-schema": "^7.0.8", +- "ajv": "^6.12.5", +- "ajv-keywords": "^3.5.2" +- }, +- "engines": { +- "node": ">= 10.13.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/webpack" +- } +- }, +- "node_modules/websocket-driver": { +- "version": "0.7.4", +- "dev": true, - "license": "Apache-2.0", - "dependencies": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", -@@ -16486,16 +18704,18 @@ - }, - "node_modules/websocket-extensions": { - "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", -+ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true, +- "dependencies": { +- "http-parser-js": ">=0.5.1", +- "safe-buffer": ">=5.1.0", +- "websocket-extensions": ">=0.1.1" +- }, +- "engines": { +- "node": ">=0.8.0" +- } +- }, +- "node_modules/websocket-extensions": { +- "version": "0.1.4", +- "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/whatwg-url": { - "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", -+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, +- "engines": { +- "node": ">=0.8.0" +- } +- }, +- "node_modules/whatwg-url": { +- "version": "5.0.0", +- "dev": true, - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" -@@ -16503,7 +18723,8 @@ - }, - "node_modules/which": { - "version": "2.0.2", +- "dependencies": { +- "tr46": "~0.0.3", +- "webidl-conversions": "^3.0.0" +- } +- }, +- "node_modules/which": { +- "version": "2.0.2", - "license": "ISC", -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dependencies": { - "isexe": "^2.0.0" - }, -@@ -16516,8 +18737,9 @@ - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", -+ "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, +- "dependencies": { +- "isexe": "^2.0.0" +- }, +- "bin": { +- "node-which": "bin/node-which" +- }, +- "engines": { +- "node": ">= 8" +- } +- }, +- "node_modules/which-boxed-primitive": { +- "version": "1.0.2", +- "dev": true, - "license": "MIT", - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", -@@ -16531,19 +18753,21 @@ - }, - "node_modules/which-module": { - "version": "2.0.1", +- "dependencies": { +- "is-bigint": "^1.0.1", +- "is-boolean-object": "^1.1.0", +- "is-number-object": "^1.0.4", +- "is-string": "^1.0.5", +- "is-symbol": "^1.0.3" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" +- } +- }, +- "node_modules/which-module": { +- "version": "2.0.1", - "dev": true, - "license": "ISC" -+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", -+ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", -+ "dev": true - }, - "node_modules/which-typed-array": { +- }, +- "node_modules/which-typed-array": { - "version": "1.1.13", -+ "version": "1.1.15", -+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", -+ "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", - "dev": true, +- "dev": true, - "license": "MIT", - "dependencies": { +- "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", -+ "available-typed-arrays": "^1.0.7", -+ "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", +- "for-each": "^0.3.3", +- "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" -+ "has-tostringtag": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" -@@ -16554,16 +18778,28 @@ - }, - "node_modules/wildcard": { - "version": "2.0.1", +- }, +- "engines": { +- "node": ">= 0.4" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" +- } +- }, +- "node_modules/wildcard": { +- "version": "2.0.1", - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", -+ "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==" -+ }, -+ "node_modules/word-wrap": { -+ "version": "1.2.5", -+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", -+ "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", -+ "dev": true, -+ "engines": { -+ "node": ">=0.10.0" -+ } - }, - "node_modules/wordwrap": { - "version": "1.0.0", +- }, +- "node_modules/wordwrap": { +- "version": "1.0.0", - "dev": true, - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", -+ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", -+ "dev": true - }, - "node_modules/wrap-ansi": { - "version": "3.0.1", +- }, +- "node_modules/wrap-ansi": { +- "version": "3.0.1", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", -+ "integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==", - "dependencies": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0" -@@ -16575,8 +18811,9 @@ - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, +- "dependencies": { +- "string-width": "^2.1.1", +- "strip-ansi": "^4.0.0" +- }, +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/wrap-ansi-cjs": { +- "name": "wrap-ansi", +- "version": "7.0.0", +- "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", -@@ -16591,21 +18828,24 @@ - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "3.0.1", +- "dependencies": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- }, +- "engines": { +- "node": ">=10" +- }, +- "funding": { +- "url": "https://github.com/chalk/wrap-ansi?sponsor=1" +- } +- }, +- "node_modules/wrap-ansi/node_modules/ansi-regex": { +- "version": "3.0.1", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", -+ "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "engines": { - "node": ">=4" - } - }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { +- "version": "2.0.0", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", -+ "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "engines": { - "node": ">=4" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "2.1.1", +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/wrap-ansi/node_modules/string-width": { +- "version": "2.1.1", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", -+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" -@@ -16616,7 +18856,8 @@ - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "4.0.0", +- "dependencies": { +- "is-fullwidth-code-point": "^2.0.0", +- "strip-ansi": "^4.0.0" +- }, +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/wrap-ansi/node_modules/strip-ansi": { +- "version": "4.0.0", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", -+ "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dependencies": { - "ansi-regex": "^3.0.0" - }, -@@ -16626,12 +18867,14 @@ - }, - "node_modules/wrappy": { - "version": "1.0.2", +- "dependencies": { +- "ansi-regex": "^3.0.0" +- }, +- "engines": { +- "node": ">=4" +- } +- }, +- "node_modules/wrappy": { +- "version": "1.0.2", - "license": "ISC" -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/write-file-atomic": { - "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", -+ "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, +- }, +- "node_modules/write-file-atomic": { +- "version": "5.0.1", +- "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" -@@ -16640,21 +18883,11 @@ - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, +- "dependencies": { +- "imurmurhash": "^0.1.4", +- "signal-exit": "^4.0.1" +- }, +- "engines": { +- "node": "^14.17.0 || ^16.13.0 || >=18.0.0" +- } +- }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "4.1.0", - "dev": true, @@ -21836,133 +21499,112 @@ index a38125e..a1067b0 100644 - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/ws": { +- "node_modules/ws": { - "version": "8.14.2", -+ "version": "8.18.0", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", -+ "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "dev": true, +- "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, -@@ -16673,23 +18906,26 @@ - }, - "node_modules/xmlbuilder": { - "version": "15.1.1", -+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", -+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", - "dev": true, +- "engines": { +- "node": ">=10.0.0" +- }, +- "peerDependencies": { +- "bufferutil": "^4.0.1", +- "utf-8-validate": ">=5.0.2" +- }, +- "peerDependenciesMeta": { +- "bufferutil": { +- "optional": true +- }, +- "utf-8-validate": { +- "optional": true +- } +- } +- }, +- "node_modules/xmlbuilder": { +- "version": "15.1.1", +- "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.0" - } - }, - "node_modules/xtend": { - "version": "4.0.2", +- "engines": { +- "node": ">=8.0" +- } +- }, +- "node_modules/xtend": { +- "version": "4.0.2", - "license": "MIT", -+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", -+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "engines": { - "node": ">=0.4" - } - }, - "node_modules/xvfb-maybe": { - "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/xvfb-maybe/-/xvfb-maybe-0.2.1.tgz", -+ "integrity": "sha512-9IyRz3l6Qyhl6LvnGRF5jMPB4oBEepQnuzvVAFTynP6ACLLSevqigICJ9d/+ofl29m2daeaVBChnPYUnaeJ7yA==", - "dev": true, +- "engines": { +- "node": ">=0.4" +- } +- }, +- "node_modules/xvfb-maybe": { +- "version": "0.2.1", +- "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^2.2.0", - "which": "^1.2.4" -@@ -16700,21 +18936,24 @@ - }, - "node_modules/xvfb-maybe/node_modules/debug": { - "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, +- "dependencies": { +- "debug": "^2.2.0", +- "which": "^1.2.4" +- }, +- "bin": { +- "xvfb-maybe": "src/xvfb-maybe.js" +- } +- }, +- "node_modules/xvfb-maybe/node_modules/debug": { +- "version": "2.6.9", +- "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/xvfb-maybe/node_modules/ms": { - "version": "2.0.0", +- "dependencies": { +- "ms": "2.0.0" +- } +- }, +- "node_modules/xvfb-maybe/node_modules/ms": { +- "version": "2.0.0", - "dev": true, - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -+ "dev": true - }, - "node_modules/xvfb-maybe/node_modules/which": { - "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", -+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, +- }, +- "node_modules/xvfb-maybe/node_modules/which": { +- "version": "1.3.1", +- "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, -@@ -16723,126 +18962,55 @@ - } - }, - "node_modules/y18n": { +- "dependencies": { +- "isexe": "^2.0.0" +- }, +- "bin": { +- "which": "bin/which" +- } +- }, +- "node_modules/y18n": { - "version": "4.0.3", -+ "version": "5.0.8", -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, +- "dev": true, - "license": "ISC" -+ "engines": { -+ "node": ">=10" -+ } - }, - "node_modules/yaku": { - "version": "0.16.7", +- }, +- "node_modules/yaku": { +- "version": "0.16.7", - "license": "MIT" -+ "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.16.7.tgz", -+ "integrity": "sha512-Syu3IB3rZvKvYk7yTiyl1bo/jiEFaaStrgv1V2TIJTqYPStSMQVO8EQjg/z+DRzLq/4LIIharNT3iH1hylEIRw==" - }, - "node_modules/yallist": { - "version": "3.1.1", +- }, +- "node_modules/yallist": { +- "version": "3.1.1", - "license": "ISC" -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", -+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, - "node_modules/yargs": { +- }, +- "node_modules/yargs": { - "version": "15.4.1", -+ "version": "17.7.2", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", -+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, +- "dev": true, - "license": "MIT", - "dependencies": { +- "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", -+ "cliui": "^8.0.1", -+ "escalade": "^3.1.1", -+ "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", +- "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" -+ "string-width": "^4.2.3", -+ "y18n": "^5.0.5", -+ "yargs-parser": "^21.1.1" - }, - "engines": { +- }, +- "engines": { - "node": ">=8" -+ "node": ">=12" - } - }, - "node_modules/yargs-parser": { +- } +- }, +- "node_modules/yargs-parser": { - "version": "20.2.9", - "dev": true, - "license": "ISC", @@ -22036,73 +21678,11082 @@ index a38125e..a1067b0 100644 - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "18.1.3", -+ "version": "21.1.1", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, +- "dev": true, - "license": "ISC", - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { +- "engines": { - "node": ">=6" +- } +- }, +- "node_modules/yauzl": { +- "version": "2.10.0", +- "license": "MIT", +- "dependencies": { +- "buffer-crc32": "~0.2.3", +- "fd-slicer": "~1.1.0" +- } +- }, +- "node_modules/yn": { +- "version": "3.1.1", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=6" +- } +- }, +- "node_modules/yocto-queue": { +- "version": "0.1.0", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=10" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/zip-stream": { +- "version": "4.1.1", +- "dev": true, +- "license": "MIT", +- "peer": true, +- "dependencies": { +- "archiver-utils": "^3.0.4", +- "compress-commons": "^4.1.2", +- "readable-stream": "^3.6.0" +- }, +- "engines": { +- "node": ">= 10" +- } +- }, +- "node_modules/zip-stream/node_modules/archiver-utils": { +- "version": "3.0.4", +- "dev": true, +- "license": "MIT", +- "peer": true, +- "dependencies": { +- "glob": "^7.2.3", +- "graceful-fs": "^4.2.0", +- "lazystream": "^1.0.0", +- "lodash.defaults": "^4.2.0", +- "lodash.difference": "^4.5.0", +- "lodash.flatten": "^4.4.0", +- "lodash.isplainobject": "^4.0.6", +- "lodash.union": "^4.6.0", +- "normalize-path": "^3.0.0", +- "readable-stream": "^3.6.0" +- }, +- "engines": { +- "node": ">= 10" +- } +- } +- }, +- "dependencies": { +- "@aashutoshrathi/word-wrap": { +- "version": "1.2.6", +- "dev": true +- }, +- "@ampproject/remapping": { +- "version": "2.2.1", +- "peer": true, +- "requires": { +- "@jridgewell/gen-mapping": "^0.3.0", +- "@jridgewell/trace-mapping": "^0.3.9" +- } +- }, +- "@babel/code-frame": { +- "version": "7.23.4", +- "requires": { +- "@babel/highlight": "^7.23.4", +- "chalk": "^2.4.2" +- }, +- "dependencies": { +- "ansi-styles": { +- "version": "3.2.1", +- "requires": { +- "color-convert": "^1.9.0" +- } +- }, +- "chalk": { +- "version": "2.4.2", +- "requires": { +- "ansi-styles": "^3.2.1", +- "escape-string-regexp": "^1.0.5", +- "supports-color": "^5.3.0" +- } +- }, +- "color-convert": { +- "version": "1.9.3", +- "requires": { +- "color-name": "1.1.3" +- } +- }, +- "color-name": { +- "version": "1.1.3" +- }, +- "escape-string-regexp": { +- "version": "1.0.5" +- }, +- "has-flag": { +- "version": "3.0.0" +- }, +- "supports-color": { +- "version": "5.5.0", +- "requires": { +- "has-flag": "^3.0.0" +- } +- } +- } +- }, +- "@babel/compat-data": { +- "version": "7.23.3" +- }, +- "@babel/core": { +- "version": "7.23.3", +- "peer": true, +- "requires": { +- "@ampproject/remapping": "^2.2.0", +- "@babel/code-frame": "^7.22.13", +- "@babel/generator": "^7.23.3", +- "@babel/helper-compilation-targets": "^7.22.15", +- "@babel/helper-module-transforms": "^7.23.3", +- "@babel/helpers": "^7.23.2", +- "@babel/parser": "^7.23.3", +- "@babel/template": "^7.22.15", +- "@babel/traverse": "^7.23.3", +- "@babel/types": "^7.23.3", +- "convert-source-map": "^2.0.0", +- "debug": "^4.1.0", +- "gensync": "^1.0.0-beta.2", +- "json5": "^2.2.3", +- "semver": "^6.3.1" +- } +- }, +- "@babel/eslint-parser": { +- "version": "7.15.8", +- "dev": true, +- "requires": { +- "eslint-scope": "^5.1.1", +- "eslint-visitor-keys": "^2.1.0", +- "semver": "^6.3.0" +- } +- }, +- "@babel/generator": { +- "version": "7.23.4", +- "requires": { +- "@babel/types": "^7.23.4", +- "@jridgewell/gen-mapping": "^0.3.2", +- "@jridgewell/trace-mapping": "^0.3.17", +- "jsesc": "^2.5.1" +- } +- }, +- "@babel/helper-annotate-as-pure": { +- "version": "7.22.5", +- "dev": true, +- "requires": { +- "@babel/types": "^7.22.5" +- } +- }, +- "@babel/helper-builder-binary-assignment-operator-visitor": { +- "version": "7.22.15", +- "dev": true, +- "requires": { +- "@babel/types": "^7.22.15" +- } +- }, +- "@babel/helper-compilation-targets": { +- "version": "7.22.15", +- "requires": { +- "@babel/compat-data": "^7.22.9", +- "@babel/helper-validator-option": "^7.22.15", +- "browserslist": "^4.21.9", +- "lru-cache": "^5.1.1", +- "semver": "^6.3.1" +- } +- }, +- "@babel/helper-create-class-features-plugin": { +- "version": "7.22.15", +- "dev": true, +- "requires": { +- "@babel/helper-annotate-as-pure": "^7.22.5", +- "@babel/helper-environment-visitor": "^7.22.5", +- "@babel/helper-function-name": "^7.22.5", +- "@babel/helper-member-expression-to-functions": "^7.22.15", +- "@babel/helper-optimise-call-expression": "^7.22.5", +- "@babel/helper-replace-supers": "^7.22.9", +- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", +- "@babel/helper-split-export-declaration": "^7.22.6", +- "semver": "^6.3.1" +- } +- }, +- "@babel/helper-create-regexp-features-plugin": { +- "version": "7.22.15", +- "dev": true, +- "requires": { +- "@babel/helper-annotate-as-pure": "^7.22.5", +- "regexpu-core": "^5.3.1", +- "semver": "^6.3.1" +- } +- }, +- "@babel/helper-define-polyfill-provider": { +- "version": "0.2.4", +- "dev": true, +- "requires": { +- "@babel/helper-compilation-targets": "^7.13.0", +- "@babel/helper-module-imports": "^7.12.13", +- "@babel/helper-plugin-utils": "^7.13.0", +- "@babel/traverse": "^7.13.0", +- "debug": "^4.1.1", +- "lodash.debounce": "^4.0.8", +- "resolve": "^1.14.2", +- "semver": "^6.1.2" +- } +- }, +- "@babel/helper-environment-visitor": { +- "version": "7.22.20" +- }, +- "@babel/helper-function-name": { +- "version": "7.23.0", +- "requires": { +- "@babel/template": "^7.22.15", +- "@babel/types": "^7.23.0" +- } +- }, +- "@babel/helper-hoist-variables": { +- "version": "7.22.5", +- "requires": { +- "@babel/types": "^7.22.5" +- } +- }, +- "@babel/helper-member-expression-to-functions": { +- "version": "7.23.0", +- "dev": true, +- "requires": { +- "@babel/types": "^7.23.0" +- } +- }, +- "@babel/helper-module-imports": { +- "version": "7.22.15", +- "requires": { +- "@babel/types": "^7.22.15" +- } +- }, +- "@babel/helper-module-transforms": { +- "version": "7.23.3", +- "requires": { +- "@babel/helper-environment-visitor": "^7.22.20", +- "@babel/helper-module-imports": "^7.22.15", +- "@babel/helper-simple-access": "^7.22.5", +- "@babel/helper-split-export-declaration": "^7.22.6", +- "@babel/helper-validator-identifier": "^7.22.20" +- } +- }, +- "@babel/helper-optimise-call-expression": { +- "version": "7.22.5", +- "dev": true, +- "requires": { +- "@babel/types": "^7.22.5" +- } +- }, +- "@babel/helper-plugin-utils": { +- "version": "7.22.5", +- "dev": true +- }, +- "@babel/helper-remap-async-to-generator": { +- "version": "7.22.20", +- "dev": true, +- "requires": { +- "@babel/helper-annotate-as-pure": "^7.22.5", +- "@babel/helper-environment-visitor": "^7.22.20", +- "@babel/helper-wrap-function": "^7.22.20" +- } +- }, +- "@babel/helper-replace-supers": { +- "version": "7.22.20", +- "dev": true, +- "requires": { +- "@babel/helper-environment-visitor": "^7.22.20", +- "@babel/helper-member-expression-to-functions": "^7.22.15", +- "@babel/helper-optimise-call-expression": "^7.22.5" +- } +- }, +- "@babel/helper-simple-access": { +- "version": "7.22.5", +- "requires": { +- "@babel/types": "^7.22.5" +- } +- }, +- "@babel/helper-skip-transparent-expression-wrappers": { +- "version": "7.22.5", +- "dev": true, +- "requires": { +- "@babel/types": "^7.22.5" +- } +- }, +- "@babel/helper-split-export-declaration": { +- "version": "7.22.6", +- "requires": { +- "@babel/types": "^7.22.5" +- } +- }, +- "@babel/helper-string-parser": { +- "version": "7.23.4" +- }, +- "@babel/helper-validator-identifier": { +- "version": "7.22.20" +- }, +- "@babel/helper-validator-option": { +- "version": "7.22.15" +- }, +- "@babel/helper-wrap-function": { +- "version": "7.22.20", +- "dev": true, +- "requires": { +- "@babel/helper-function-name": "^7.22.5", +- "@babel/template": "^7.22.15", +- "@babel/types": "^7.22.19" +- } +- }, +- "@babel/helpers": { +- "version": "7.23.4", +- "peer": true, +- "requires": { +- "@babel/template": "^7.22.15", +- "@babel/traverse": "^7.23.4", +- "@babel/types": "^7.23.4" +- } +- }, +- "@babel/highlight": { +- "version": "7.23.4", +- "requires": { +- "@babel/helper-validator-identifier": "^7.22.20", +- "chalk": "^2.4.2", +- "js-tokens": "^4.0.0" +- }, +- "dependencies": { +- "ansi-styles": { +- "version": "3.2.1", +- "requires": { +- "color-convert": "^1.9.0" +- } +- }, +- "chalk": { +- "version": "2.4.2", +- "requires": { +- "ansi-styles": "^3.2.1", +- "escape-string-regexp": "^1.0.5", +- "supports-color": "^5.3.0" +- } +- }, +- "color-convert": { +- "version": "1.9.3", +- "requires": { +- "color-name": "1.1.3" +- } +- }, +- "color-name": { +- "version": "1.1.3" +- }, +- "escape-string-regexp": { +- "version": "1.0.5" +- }, +- "has-flag": { +- "version": "3.0.0" +- }, +- "supports-color": { +- "version": "5.5.0", +- "requires": { +- "has-flag": "^3.0.0" +- } +- } +- } +- }, +- "@babel/parser": { +- "version": "7.24.6", +- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz", +- "integrity": "sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==" +- }, +- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", +- "@babel/plugin-transform-optional-chaining": "^7.23.3" +- } +- }, +- "@babel/plugin-proposal-async-generator-functions": { +- "version": "7.20.7", +- "dev": true, +- "requires": { +- "@babel/helper-environment-visitor": "^7.18.9", +- "@babel/helper-plugin-utils": "^7.20.2", +- "@babel/helper-remap-async-to-generator": "^7.18.9", +- "@babel/plugin-syntax-async-generators": "^7.8.4" +- } +- }, +- "@babel/plugin-proposal-class-properties": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-create-class-features-plugin": "^7.18.6", +- "@babel/helper-plugin-utils": "^7.18.6" +- } +- }, +- "@babel/plugin-proposal-class-static-block": { +- "version": "7.21.0", +- "dev": true, +- "requires": { +- "@babel/helper-create-class-features-plugin": "^7.21.0", +- "@babel/helper-plugin-utils": "^7.20.2", +- "@babel/plugin-syntax-class-static-block": "^7.14.5" +- } +- }, +- "@babel/plugin-proposal-dynamic-import": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.18.6", +- "@babel/plugin-syntax-dynamic-import": "^7.8.3" +- } +- }, +- "@babel/plugin-proposal-export-namespace-from": { +- "version": "7.18.9", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.18.9", +- "@babel/plugin-syntax-export-namespace-from": "^7.8.3" +- } +- }, +- "@babel/plugin-proposal-json-strings": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.18.6", +- "@babel/plugin-syntax-json-strings": "^7.8.3" +- } +- }, +- "@babel/plugin-proposal-logical-assignment-operators": { +- "version": "7.20.7", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.20.2", +- "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" +- } +- }, +- "@babel/plugin-proposal-nullish-coalescing-operator": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.18.6", +- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" +- } +- }, +- "@babel/plugin-proposal-numeric-separator": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.18.6", +- "@babel/plugin-syntax-numeric-separator": "^7.10.4" +- } +- }, +- "@babel/plugin-proposal-object-rest-spread": { +- "version": "7.20.7", +- "dev": true, +- "requires": { +- "@babel/compat-data": "^7.20.5", +- "@babel/helper-compilation-targets": "^7.20.7", +- "@babel/helper-plugin-utils": "^7.20.2", +- "@babel/plugin-syntax-object-rest-spread": "^7.8.3", +- "@babel/plugin-transform-parameters": "^7.20.7" +- } +- }, +- "@babel/plugin-proposal-optional-catch-binding": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.18.6", +- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" +- } +- }, +- "@babel/plugin-proposal-optional-chaining": { +- "version": "7.21.0", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.20.2", +- "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", +- "@babel/plugin-syntax-optional-chaining": "^7.8.3" +- } +- }, +- "@babel/plugin-proposal-private-methods": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-create-class-features-plugin": "^7.18.6", +- "@babel/helper-plugin-utils": "^7.18.6" +- } +- }, +- "@babel/plugin-proposal-private-property-in-object": { +- "version": "7.21.11", +- "dev": true, +- "requires": { +- "@babel/helper-annotate-as-pure": "^7.18.6", +- "@babel/helper-create-class-features-plugin": "^7.21.0", +- "@babel/helper-plugin-utils": "^7.20.2", +- "@babel/plugin-syntax-private-property-in-object": "^7.14.5" +- } +- }, +- "@babel/plugin-proposal-unicode-property-regex": { +- "version": "7.18.6", +- "dev": true, +- "requires": { +- "@babel/helper-create-regexp-features-plugin": "^7.18.6", +- "@babel/helper-plugin-utils": "^7.18.6" +- } +- }, +- "@babel/plugin-syntax-async-generators": { +- "version": "7.8.4", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-class-properties": { +- "version": "7.12.13", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.12.13" +- } +- }, +- "@babel/plugin-syntax-class-static-block": { +- "version": "7.14.5", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.14.5" +- } +- }, +- "@babel/plugin-syntax-dynamic-import": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-export-namespace-from": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.3" +- } +- }, +- "@babel/plugin-syntax-json-strings": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-logical-assignment-operators": { +- "version": "7.10.4", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.10.4" +- } +- }, +- "@babel/plugin-syntax-nullish-coalescing-operator": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-numeric-separator": { +- "version": "7.10.4", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.10.4" +- } +- }, +- "@babel/plugin-syntax-object-rest-spread": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-optional-catch-binding": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-optional-chaining": { +- "version": "7.8.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.8.0" +- } +- }, +- "@babel/plugin-syntax-private-property-in-object": { +- "version": "7.14.5", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.14.5" +- } +- }, +- "@babel/plugin-syntax-top-level-await": { +- "version": "7.14.5", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.14.5" +- } +- }, +- "@babel/plugin-syntax-typescript": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-arrow-functions": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-async-to-generator": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-module-imports": "^7.22.15", +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-remap-async-to-generator": "^7.22.20" +- } +- }, +- "@babel/plugin-transform-block-scoped-functions": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-block-scoping": { +- "version": "7.23.4", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-classes": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-annotate-as-pure": "^7.22.5", +- "@babel/helper-compilation-targets": "^7.22.15", +- "@babel/helper-environment-visitor": "^7.22.20", +- "@babel/helper-function-name": "^7.23.0", +- "@babel/helper-optimise-call-expression": "^7.22.5", +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-replace-supers": "^7.22.20", +- "@babel/helper-split-export-declaration": "^7.22.6", +- "globals": "^11.1.0" +- } +- }, +- "@babel/plugin-transform-computed-properties": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/template": "^7.22.15" +- } +- }, +- "@babel/plugin-transform-destructuring": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-dotall-regex": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-create-regexp-features-plugin": "^7.22.15", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-duplicate-keys": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-exponentiation-operator": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-for-of": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-function-name": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-compilation-targets": "^7.22.15", +- "@babel/helper-function-name": "^7.23.0", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-literals": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-member-expression-literals": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-modules-amd": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-module-transforms": "^7.23.3", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-modules-commonjs": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-module-transforms": "^7.23.3", +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-simple-access": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-modules-systemjs": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-hoist-variables": "^7.22.5", +- "@babel/helper-module-transforms": "^7.23.3", +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-validator-identifier": "^7.22.20" +- } +- }, +- "@babel/plugin-transform-modules-umd": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-module-transforms": "^7.23.3", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-named-capturing-groups-regex": { +- "version": "7.22.5", +- "dev": true, +- "requires": { +- "@babel/helper-create-regexp-features-plugin": "^7.22.5", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-new-target": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-object-super": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-replace-supers": "^7.22.20" +- } +- }, +- "@babel/plugin-transform-optional-chaining": { +- "version": "7.23.4", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", +- "@babel/plugin-syntax-optional-chaining": "^7.8.3" +- } +- }, +- "@babel/plugin-transform-parameters": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-property-literals": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-regenerator": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5", +- "regenerator-transform": "^0.15.2" +- } +- }, +- "@babel/plugin-transform-reserved-words": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-shorthand-properties": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-spread": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-sticky-regex": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-template-literals": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-typeof-symbol": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-typescript": { +- "version": "7.23.4", +- "dev": true, +- "requires": { +- "@babel/helper-annotate-as-pure": "^7.22.5", +- "@babel/helper-create-class-features-plugin": "^7.22.15", +- "@babel/helper-plugin-utils": "^7.22.5", +- "@babel/plugin-syntax-typescript": "^7.23.3" +- } +- }, +- "@babel/plugin-transform-unicode-escapes": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/plugin-transform-unicode-regex": { +- "version": "7.23.3", +- "dev": true, +- "requires": { +- "@babel/helper-create-regexp-features-plugin": "^7.22.15", +- "@babel/helper-plugin-utils": "^7.22.5" +- } +- }, +- "@babel/preset-env": { +- "version": "7.15.8", +- "dev": true, +- "requires": { +- "@babel/compat-data": "^7.15.0", +- "@babel/helper-compilation-targets": "^7.15.4", +- "@babel/helper-plugin-utils": "^7.14.5", +- "@babel/helper-validator-option": "^7.14.5", +- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4", +- "@babel/plugin-proposal-async-generator-functions": "^7.15.8", +- "@babel/plugin-proposal-class-properties": "^7.14.5", +- "@babel/plugin-proposal-class-static-block": "^7.15.4", +- "@babel/plugin-proposal-dynamic-import": "^7.14.5", +- "@babel/plugin-proposal-export-namespace-from": "^7.14.5", +- "@babel/plugin-proposal-json-strings": "^7.14.5", +- "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", +- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", +- "@babel/plugin-proposal-numeric-separator": "^7.14.5", +- "@babel/plugin-proposal-object-rest-spread": "^7.15.6", +- "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", +- "@babel/plugin-proposal-optional-chaining": "^7.14.5", +- "@babel/plugin-proposal-private-methods": "^7.14.5", +- "@babel/plugin-proposal-private-property-in-object": "^7.15.4", +- "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", +- "@babel/plugin-syntax-async-generators": "^7.8.4", +- "@babel/plugin-syntax-class-properties": "^7.12.13", +- "@babel/plugin-syntax-class-static-block": "^7.14.5", +- "@babel/plugin-syntax-dynamic-import": "^7.8.3", +- "@babel/plugin-syntax-export-namespace-from": "^7.8.3", +- "@babel/plugin-syntax-json-strings": "^7.8.3", +- "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", +- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", +- "@babel/plugin-syntax-numeric-separator": "^7.10.4", +- "@babel/plugin-syntax-object-rest-spread": "^7.8.3", +- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", +- "@babel/plugin-syntax-optional-chaining": "^7.8.3", +- "@babel/plugin-syntax-private-property-in-object": "^7.14.5", +- "@babel/plugin-syntax-top-level-await": "^7.14.5", +- "@babel/plugin-transform-arrow-functions": "^7.14.5", +- "@babel/plugin-transform-async-to-generator": "^7.14.5", +- "@babel/plugin-transform-block-scoped-functions": "^7.14.5", +- "@babel/plugin-transform-block-scoping": "^7.15.3", +- "@babel/plugin-transform-classes": "^7.15.4", +- "@babel/plugin-transform-computed-properties": "^7.14.5", +- "@babel/plugin-transform-destructuring": "^7.14.7", +- "@babel/plugin-transform-dotall-regex": "^7.14.5", +- "@babel/plugin-transform-duplicate-keys": "^7.14.5", +- "@babel/plugin-transform-exponentiation-operator": "^7.14.5", +- "@babel/plugin-transform-for-of": "^7.15.4", +- "@babel/plugin-transform-function-name": "^7.14.5", +- "@babel/plugin-transform-literals": "^7.14.5", +- "@babel/plugin-transform-member-expression-literals": "^7.14.5", +- "@babel/plugin-transform-modules-amd": "^7.14.5", +- "@babel/plugin-transform-modules-commonjs": "^7.15.4", +- "@babel/plugin-transform-modules-systemjs": "^7.15.4", +- "@babel/plugin-transform-modules-umd": "^7.14.5", +- "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", +- "@babel/plugin-transform-new-target": "^7.14.5", +- "@babel/plugin-transform-object-super": "^7.14.5", +- "@babel/plugin-transform-parameters": "^7.15.4", +- "@babel/plugin-transform-property-literals": "^7.14.5", +- "@babel/plugin-transform-regenerator": "^7.14.5", +- "@babel/plugin-transform-reserved-words": "^7.14.5", +- "@babel/plugin-transform-shorthand-properties": "^7.14.5", +- "@babel/plugin-transform-spread": "^7.15.8", +- "@babel/plugin-transform-sticky-regex": "^7.14.5", +- "@babel/plugin-transform-template-literals": "^7.14.5", +- "@babel/plugin-transform-typeof-symbol": "^7.14.5", +- "@babel/plugin-transform-unicode-escapes": "^7.14.5", +- "@babel/plugin-transform-unicode-regex": "^7.14.5", +- "@babel/preset-modules": "^0.1.4", +- "@babel/types": "^7.15.6", +- "babel-plugin-polyfill-corejs2": "^0.2.2", +- "babel-plugin-polyfill-corejs3": "^0.2.5", +- "babel-plugin-polyfill-regenerator": "^0.2.2", +- "core-js-compat": "^3.16.0", +- "semver": "^6.3.0" +- } +- }, +- "@babel/preset-modules": { +- "version": "0.1.6", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.0.0", +- "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", +- "@babel/plugin-transform-dotall-regex": "^7.4.4", +- "@babel/types": "^7.4.4", +- "esutils": "^2.0.2" +- } +- }, +- "@babel/preset-typescript": { +- "version": "7.16.7", +- "dev": true, +- "requires": { +- "@babel/helper-plugin-utils": "^7.16.7", +- "@babel/helper-validator-option": "^7.16.7", +- "@babel/plugin-transform-typescript": "^7.16.7" +- } +- }, +- "@babel/regjsgen": { +- "version": "0.8.0", +- "dev": true +- }, +- "@babel/runtime": { +- "version": "7.23.4", +- "dev": true, +- "requires": { +- "regenerator-runtime": "^0.14.0" +- } +- }, +- "@babel/template": { +- "version": "7.22.15", +- "requires": { +- "@babel/code-frame": "^7.22.13", +- "@babel/parser": "^7.22.15", +- "@babel/types": "^7.22.15" +- } +- }, +- "@babel/traverse": { +- "version": "7.23.4", +- "requires": { +- "@babel/code-frame": "^7.23.4", +- "@babel/generator": "^7.23.4", +- "@babel/helper-environment-visitor": "^7.22.20", +- "@babel/helper-function-name": "^7.23.0", +- "@babel/helper-hoist-variables": "^7.22.5", +- "@babel/helper-split-export-declaration": "^7.22.6", +- "@babel/parser": "^7.23.4", +- "@babel/types": "^7.23.4", +- "debug": "^4.1.0", +- "globals": "^11.1.0" +- } +- }, +- "@babel/types": { +- "version": "7.23.4", +- "requires": { +- "@babel/helper-string-parser": "^7.23.4", +- "@babel/helper-validator-identifier": "^7.22.20", +- "to-fast-properties": "^2.0.0" +- } +- }, +- "@commitlint/cli": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/format": "^19.0.3", +- "@commitlint/lint": "^19.0.3", +- "@commitlint/load": "^19.0.3", +- "@commitlint/read": "^19.0.3", +- "@commitlint/types": "^19.0.3", +- "execa": "^8.0.1", +- "yargs": "^17.0.0" +- }, +- "dependencies": { +- "cliui": { +- "version": "8.0.1", +- "dev": true, +- "requires": { +- "string-width": "^4.2.0", +- "strip-ansi": "^6.0.1", +- "wrap-ansi": "^7.0.0" +- } +- }, +- "execa": { +- "version": "8.0.1", +- "dev": true, +- "requires": { +- "cross-spawn": "^7.0.3", +- "get-stream": "^8.0.1", +- "human-signals": "^5.0.0", +- "is-stream": "^3.0.0", +- "merge-stream": "^2.0.0", +- "npm-run-path": "^5.1.0", +- "onetime": "^6.0.0", +- "signal-exit": "^4.1.0", +- "strip-final-newline": "^3.0.0" +- } +- }, +- "get-stream": { +- "version": "8.0.1", +- "dev": true +- }, +- "human-signals": { +- "version": "5.0.0", +- "dev": true +- }, +- "is-stream": { +- "version": "3.0.0", +- "dev": true +- }, +- "mimic-fn": { +- "version": "4.0.0", +- "dev": true +- }, +- "npm-run-path": { +- "version": "5.3.0", +- "dev": true, +- "requires": { +- "path-key": "^4.0.0" +- } +- }, +- "onetime": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "mimic-fn": "^4.0.0" +- } +- }, +- "path-key": { +- "version": "4.0.0", +- "dev": true +- }, +- "signal-exit": { +- "version": "4.1.0", +- "dev": true +- }, +- "strip-final-newline": { +- "version": "3.0.0", +- "dev": true +- }, +- "wrap-ansi": { +- "version": "7.0.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- } +- }, +- "y18n": { +- "version": "5.0.8", +- "dev": true +- }, +- "yargs": { +- "version": "17.7.2", +- "dev": true, +- "requires": { +- "cliui": "^8.0.1", +- "escalade": "^3.1.1", +- "get-caller-file": "^2.0.5", +- "require-directory": "^2.1.1", +- "string-width": "^4.2.3", +- "y18n": "^5.0.5", +- "yargs-parser": "^21.1.1" +- } +- }, +- "yargs-parser": { +- "version": "21.1.1", +- "dev": true +- } +- } +- }, +- "@commitlint/config-conventional": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/types": "^19.0.3", +- "conventional-changelog-conventionalcommits": "^7.0.2" +- }, +- "dependencies": { +- "conventional-changelog-conventionalcommits": { +- "version": "7.0.2", +- "dev": true, +- "requires": { +- "compare-func": "^2.0.0" +- } +- } +- } +- }, +- "@commitlint/config-validator": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/types": "^19.0.3", +- "ajv": "^8.11.0" +- }, +- "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "dev": true, +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0", +- "dev": true +- } +- } +- }, +- "@commitlint/ensure": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/types": "^19.0.3", +- "lodash.camelcase": "^4.3.0", +- "lodash.kebabcase": "^4.1.1", +- "lodash.snakecase": "^4.1.1", +- "lodash.startcase": "^4.4.0", +- "lodash.upperfirst": "^4.3.1" +- } +- }, +- "@commitlint/execute-rule": { +- "version": "19.0.0", +- "dev": true +- }, +- "@commitlint/format": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/types": "^19.0.3", +- "chalk": "^5.3.0" +- }, +- "dependencies": { +- "chalk": { +- "version": "5.3.0", +- "dev": true +- } +- } +- }, +- "@commitlint/is-ignored": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/types": "^19.0.3", +- "semver": "^7.6.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.6.0", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "@commitlint/lint": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/is-ignored": "^19.0.3", +- "@commitlint/parse": "^19.0.3", +- "@commitlint/rules": "^19.0.3", +- "@commitlint/types": "^19.0.3" +- } +- }, +- "@commitlint/load": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/config-validator": "^19.0.3", +- "@commitlint/execute-rule": "^19.0.0", +- "@commitlint/resolve-extends": "^19.0.3", +- "@commitlint/types": "^19.0.3", +- "chalk": "^5.3.0", +- "cosmiconfig": "^8.3.6", +- "cosmiconfig-typescript-loader": "^5.0.0", +- "lodash.isplainobject": "^4.0.6", +- "lodash.merge": "^4.6.2", +- "lodash.uniq": "^4.5.0" +- }, +- "dependencies": { +- "chalk": { +- "version": "5.3.0", +- "dev": true +- }, +- "cosmiconfig": { +- "version": "8.3.6", +- "dev": true, +- "requires": { +- "import-fresh": "^3.3.0", +- "js-yaml": "^4.1.0", +- "parse-json": "^5.2.0", +- "path-type": "^4.0.0" +- } +- }, +- "cosmiconfig-typescript-loader": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "jiti": "^1.19.1" +- } +- }, +- "parse-json": { +- "version": "5.2.0", +- "dev": true, +- "requires": { +- "@babel/code-frame": "^7.0.0", +- "error-ex": "^1.3.1", +- "json-parse-even-better-errors": "^2.3.0", +- "lines-and-columns": "^1.1.6" +- } +- }, +- "typescript": { +- "version": "5.4.2", +- "dev": true, +- "peer": true +- } +- } +- }, +- "@commitlint/message": { +- "version": "19.0.0", +- "dev": true +- }, +- "@commitlint/parse": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/types": "^19.0.3", +- "conventional-changelog-angular": "^7.0.0", +- "conventional-commits-parser": "^5.0.0" +- }, +- "dependencies": { +- "conventional-changelog-angular": { +- "version": "7.0.0", +- "dev": true, +- "requires": { +- "compare-func": "^2.0.0" +- } +- }, +- "conventional-commits-parser": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "is-text-path": "^2.0.0", +- "JSONStream": "^1.3.5", +- "meow": "^12.0.1", +- "split2": "^4.0.0" +- } +- }, +- "is-text-path": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "text-extensions": "^2.0.0" +- } +- }, +- "meow": { +- "version": "12.1.1", +- "dev": true +- }, +- "text-extensions": { +- "version": "2.4.0", +- "dev": true +- } +- } +- }, +- "@commitlint/read": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/top-level": "^19.0.0", +- "@commitlint/types": "^19.0.3", +- "git-raw-commits": "^4.0.0", +- "minimist": "^1.2.8" +- }, +- "dependencies": { +- "dargs": { +- "version": "8.1.0", +- "dev": true +- }, +- "git-raw-commits": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "dargs": "^8.0.0", +- "meow": "^12.0.1", +- "split2": "^4.0.0" +- } +- }, +- "meow": { +- "version": "12.1.1", +- "dev": true +- } +- } +- }, +- "@commitlint/resolve-extends": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/config-validator": "^19.0.3", +- "@commitlint/types": "^19.0.3", +- "global-directory": "^4.0.1", +- "import-meta-resolve": "^4.0.0", +- "lodash.mergewith": "^4.6.2", +- "resolve-from": "^5.0.0" +- }, +- "dependencies": { +- "resolve-from": { +- "version": "5.0.0", +- "dev": true +- } +- } +- }, +- "@commitlint/rules": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@commitlint/ensure": "^19.0.3", +- "@commitlint/message": "^19.0.0", +- "@commitlint/to-lines": "^19.0.0", +- "@commitlint/types": "^19.0.3", +- "execa": "^8.0.1" +- }, +- "dependencies": { +- "execa": { +- "version": "8.0.1", +- "dev": true, +- "requires": { +- "cross-spawn": "^7.0.3", +- "get-stream": "^8.0.1", +- "human-signals": "^5.0.0", +- "is-stream": "^3.0.0", +- "merge-stream": "^2.0.0", +- "npm-run-path": "^5.1.0", +- "onetime": "^6.0.0", +- "signal-exit": "^4.1.0", +- "strip-final-newline": "^3.0.0" +- } +- }, +- "get-stream": { +- "version": "8.0.1", +- "dev": true +- }, +- "human-signals": { +- "version": "5.0.0", +- "dev": true +- }, +- "is-stream": { +- "version": "3.0.0", +- "dev": true +- }, +- "mimic-fn": { +- "version": "4.0.0", +- "dev": true +- }, +- "npm-run-path": { +- "version": "5.3.0", +- "dev": true, +- "requires": { +- "path-key": "^4.0.0" +- } +- }, +- "onetime": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "mimic-fn": "^4.0.0" +- } +- }, +- "path-key": { +- "version": "4.0.0", +- "dev": true +- }, +- "signal-exit": { +- "version": "4.1.0", +- "dev": true +- }, +- "strip-final-newline": { +- "version": "3.0.0", +- "dev": true +- } +- } +- }, +- "@commitlint/to-lines": { +- "version": "19.0.0", +- "dev": true +- }, +- "@commitlint/top-level": { +- "version": "19.0.0", +- "dev": true, +- "requires": { +- "find-up": "^7.0.0" +- }, +- "dependencies": { +- "find-up": { +- "version": "7.0.0", +- "dev": true, +- "requires": { +- "locate-path": "^7.2.0", +- "path-exists": "^5.0.0", +- "unicorn-magic": "^0.1.0" +- } +- }, +- "locate-path": { +- "version": "7.2.0", +- "dev": true, +- "requires": { +- "p-locate": "^6.0.0" +- } +- }, +- "p-limit": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "yocto-queue": "^1.0.0" +- } +- }, +- "p-locate": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "p-limit": "^4.0.0" +- } +- }, +- "path-exists": { +- "version": "5.0.0", +- "dev": true +- }, +- "yocto-queue": { +- "version": "1.0.0", +- "dev": true +- } +- } +- }, +- "@commitlint/types": { +- "version": "19.0.3", +- "dev": true, +- "requires": { +- "@types/conventional-commits-parser": "^5.0.0", +- "chalk": "^5.3.0" +- }, +- "dependencies": { +- "chalk": { +- "version": "5.3.0", +- "dev": true +- } +- } +- }, +- "@cspotcode/source-map-support": { +- "version": "0.8.1", +- "dev": true, +- "requires": { +- "@jridgewell/trace-mapping": "0.3.9" +- }, +- "dependencies": { +- "@jridgewell/trace-mapping": { +- "version": "0.3.9", +- "dev": true, +- "requires": { +- "@jridgewell/resolve-uri": "^3.0.3", +- "@jridgewell/sourcemap-codec": "^1.4.10" +- } +- } +- } +- }, +- "@csstools/css-parser-algorithms": { +- "version": "2.3.2", +- "dev": true, +- "requires": {} +- }, +- "@csstools/css-tokenizer": { +- "version": "2.2.1", +- "dev": true +- }, +- "@csstools/media-query-list-parser": { +- "version": "2.1.5", +- "dev": true, +- "requires": {} +- }, +- "@csstools/selector-specificity": { +- "version": "3.0.0", +- "dev": true, +- "requires": {} +- }, +- "@develar/schema-utils": { +- "version": "2.6.5", +- "dev": true, +- "requires": { +- "ajv": "^6.12.0", +- "ajv-keywords": "^3.4.1" +- } +- }, +- "@discoveryjs/json-ext": { +- "version": "0.5.7" +- }, +- "@electron/asar": { +- "version": "3.2.10", +- "dev": true, +- "requires": { +- "commander": "^5.0.0", +- "glob": "^7.1.6", +- "minimatch": "^3.0.4" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- } +- } +- }, +- "@electron/get": { +- "version": "2.0.3", +- "requires": { +- "debug": "^4.1.1", +- "env-paths": "^2.2.0", +- "fs-extra": "^8.1.0", +- "global-agent": "^3.0.0", +- "got": "^11.8.5", +- "progress": "^2.0.3", +- "semver": "^6.2.0", +- "sumchecker": "^3.0.1" +- } +- }, +- "@electron/notarize": { +- "version": "2.2.1", +- "dev": true, +- "requires": { +- "debug": "^4.1.1", +- "fs-extra": "^9.0.1", +- "promise-retry": "^2.0.1" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "9.1.0", +- "dev": true, +- "requires": { +- "at-least-node": "^1.0.0", +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "@electron/osx-sign": { +- "version": "1.0.5", +- "dev": true, +- "requires": { +- "compare-version": "^0.1.2", +- "debug": "^4.3.4", +- "fs-extra": "^10.0.0", +- "isbinaryfile": "^4.0.8", +- "minimist": "^1.2.6", +- "plist": "^3.0.5" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "isbinaryfile": { +- "version": "4.0.10", +- "dev": true +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "@electron/remote": { +- "version": "2.1.2", +- "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", +- "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", +- "requires": {} +- }, +- "@electron/universal": { +- "version": "1.5.1", +- "dev": true, +- "requires": { +- "@electron/asar": "^3.2.1", +- "@malept/cross-spawn-promise": "^1.1.0", +- "debug": "^4.3.1", +- "dir-compare": "^3.0.0", +- "fs-extra": "^9.0.1", +- "minimatch": "^3.0.4", +- "plist": "^3.0.4" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "fs-extra": { +- "version": "9.1.0", +- "dev": true, +- "requires": { +- "at-least-node": "^1.0.0", +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "@eslint/eslintrc": { +- "version": "0.4.3", +- "dev": true, +- "requires": { +- "ajv": "^6.12.4", +- "debug": "^4.1.1", +- "espree": "^7.3.0", +- "globals": "^13.9.0", +- "ignore": "^4.0.6", +- "import-fresh": "^3.2.1", +- "js-yaml": "^3.13.1", +- "minimatch": "^3.0.4", +- "strip-json-comments": "^3.1.1" +- }, +- "dependencies": { +- "argparse": { +- "version": "1.0.10", +- "dev": true, +- "requires": { +- "sprintf-js": "~1.0.2" +- } +- }, +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "globals": { +- "version": "13.23.0", +- "dev": true, +- "requires": { +- "type-fest": "^0.20.2" +- } +- }, +- "ignore": { +- "version": "4.0.6", +- "dev": true +- }, +- "js-yaml": { +- "version": "3.14.1", +- "dev": true, +- "requires": { +- "argparse": "^1.0.7", +- "esprima": "^4.0.0" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- }, +- "sprintf-js": { +- "version": "1.0.3", +- "dev": true +- }, +- "type-fest": { +- "version": "0.20.2", +- "dev": true +- } +- } +- }, +- "@fabio286/ssh2-promise": { +- "version": "1.0.4b", +- "requires": { +- "@heroku/socksv5": "^0.0.9", +- "ssh2": "~1.14.0" +- } +- }, +- "@faker-js/faker": { +- "version": "6.1.2" +- }, +- "@floating-ui/core": { +- "version": "1.5.0", +- "requires": { +- "@floating-ui/utils": "^0.1.3" +- } +- }, +- "@floating-ui/dom": { +- "version": "1.1.1", +- "requires": { +- "@floating-ui/core": "^1.1.0" +- } +- }, +- "@floating-ui/utils": { +- "version": "0.1.6" +- }, +- "@heroku/socksv5": { +- "version": "0.0.9", +- "requires": { +- "ip-address": "^5.8.8" +- } +- }, +- "@humanwhocodes/config-array": { +- "version": "0.5.0", +- "dev": true, +- "requires": { +- "@humanwhocodes/object-schema": "^1.2.0", +- "debug": "^4.1.1", +- "minimatch": "^3.0.4" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- } +- } +- }, +- "@humanwhocodes/object-schema": { +- "version": "1.2.1", +- "dev": true +- }, +- "@hutson/parse-repository-url": { +- "version": "3.0.2", +- "dev": true +- }, +- "@intlify/core-base": { +- "version": "9.13.1", +- "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz", +- "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==", +- "requires": { +- "@intlify/message-compiler": "9.13.1", +- "@intlify/shared": "9.13.1" +- } +- }, +- "@intlify/message-compiler": { +- "version": "9.13.1", +- "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz", +- "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==", +- "requires": { +- "@intlify/shared": "9.13.1", +- "source-map-js": "^1.0.2" +- } +- }, +- "@intlify/shared": { +- "version": "9.13.1", +- "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.13.1.tgz", +- "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==" +- }, +- "@isaacs/cliui": { +- "version": "8.0.2", +- "dev": true, +- "requires": { +- "string-width": "^5.1.2", +- "string-width-cjs": "npm:string-width@^4.2.0", +- "strip-ansi": "^7.0.1", +- "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", +- "wrap-ansi": "^8.1.0", +- "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" +- }, +- "dependencies": { +- "ansi-regex": { +- "version": "6.0.1", +- "dev": true +- }, +- "ansi-styles": { +- "version": "6.2.1", +- "dev": true +- }, +- "emoji-regex": { +- "version": "9.2.2", +- "dev": true +- }, +- "string-width": { +- "version": "5.1.2", +- "dev": true, +- "requires": { +- "eastasianwidth": "^0.2.0", +- "emoji-regex": "^9.2.2", +- "strip-ansi": "^7.0.1" +- } +- }, +- "strip-ansi": { +- "version": "7.1.0", +- "dev": true, +- "requires": { +- "ansi-regex": "^6.0.1" +- } +- }, +- "wrap-ansi": { +- "version": "8.1.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^6.1.0", +- "string-width": "^5.0.1", +- "strip-ansi": "^7.0.1" +- } +- } +- } +- }, +- "@jamescoyle/vue-icon": { +- "version": "0.1.2" +- }, +- "@jridgewell/gen-mapping": { +- "version": "0.3.3", +- "requires": { +- "@jridgewell/set-array": "^1.0.1", +- "@jridgewell/sourcemap-codec": "^1.4.10", +- "@jridgewell/trace-mapping": "^0.3.9" +- } +- }, +- "@jridgewell/resolve-uri": { +- "version": "3.1.1" +- }, +- "@jridgewell/set-array": { +- "version": "1.1.2" +- }, +- "@jridgewell/source-map": { +- "version": "0.3.5", +- "requires": { +- "@jridgewell/gen-mapping": "^0.3.0", +- "@jridgewell/trace-mapping": "^0.3.9" +- } +- }, +- "@jridgewell/sourcemap-codec": { +- "version": "1.4.15" +- }, +- "@jridgewell/trace-mapping": { +- "version": "0.3.20", +- "requires": { +- "@jridgewell/resolve-uri": "^3.1.0", +- "@jridgewell/sourcemap-codec": "^1.4.14" +- } +- }, +- "@leichtgewicht/ip-codec": { +- "version": "2.0.4", +- "dev": true +- }, +- "@malept/cross-spawn-promise": { +- "version": "1.1.1", +- "dev": true, +- "requires": { +- "cross-spawn": "^7.0.1" +- } +- }, +- "@malept/flatpak-bundler": { +- "version": "0.4.0", +- "dev": true, +- "requires": { +- "debug": "^4.1.1", +- "fs-extra": "^9.0.0", +- "lodash": "^4.17.15", +- "tmp-promise": "^3.0.2" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "9.1.0", +- "dev": true, +- "requires": { +- "at-least-node": "^1.0.0", +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "@mdi/js": { +- "version": "7.2.96" +- }, +- "@nodelib/fs.scandir": { +- "version": "2.1.5", +- "dev": true, +- "requires": { +- "@nodelib/fs.stat": "2.0.5", +- "run-parallel": "^1.1.9" +- } +- }, +- "@nodelib/fs.stat": { +- "version": "2.0.5", +- "dev": true +- }, +- "@nodelib/fs.walk": { +- "version": "1.2.8", +- "dev": true, +- "requires": { +- "@nodelib/fs.scandir": "2.1.5", +- "fastq": "^1.6.0" +- } +- }, +- "@pkgjs/parseargs": { +- "version": "0.11.0", +- "dev": true, +- "optional": true +- }, +- "@playwright/test": { +- "version": "1.28.1", +- "dev": true, +- "requires": { +- "@types/node": "*", +- "playwright-core": "1.28.1" +- } +- }, +- "@sindresorhus/is": { +- "version": "4.6.0" +- }, +- "@szmarczak/http-timer": { +- "version": "4.0.6", +- "requires": { +- "defer-to-connect": "^2.0.0" +- } +- }, +- "@tootallnate/once": { +- "version": "2.0.0", +- "dev": true +- }, +- "@tsconfig/node10": { +- "version": "1.0.9", +- "dev": true +- }, +- "@tsconfig/node12": { +- "version": "1.0.11", +- "dev": true +- }, +- "@tsconfig/node14": { +- "version": "1.0.3", +- "dev": true +- }, +- "@tsconfig/node16": { +- "version": "1.0.4", +- "dev": true +- }, +- "@turf/helpers": { +- "version": "6.5.0" +- }, +- "@types/better-sqlite3": { +- "version": "7.5.0", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/body-parser": { +- "version": "1.19.5", +- "dev": true, +- "requires": { +- "@types/connect": "*", +- "@types/node": "*" +- } +- }, +- "@types/bonjour": { +- "version": "3.5.13", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/cacheable-request": { +- "version": "6.0.3", +- "requires": { +- "@types/http-cache-semantics": "*", +- "@types/keyv": "^3.1.4", +- "@types/node": "*", +- "@types/responselike": "^1.0.0" +- } +- }, +- "@types/connect": { +- "version": "3.4.38", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/connect-history-api-fallback": { +- "version": "1.5.4", +- "dev": true, +- "requires": { +- "@types/express-serve-static-core": "*", +- "@types/node": "*" +- } +- }, +- "@types/conventional-commits-parser": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/debug": { +- "version": "4.1.12", +- "dev": true, +- "requires": { +- "@types/ms": "*" +- } +- }, +- "@types/eslint": { +- "version": "8.44.7", +- "requires": { +- "@types/estree": "*", +- "@types/json-schema": "*" +- } +- }, +- "@types/eslint-scope": { +- "version": "3.7.7", +- "requires": { +- "@types/eslint": "*", +- "@types/estree": "*" +- } +- }, +- "@types/estree": { +- "version": "1.0.5" +- }, +- "@types/express": { +- "version": "4.17.21", +- "dev": true, +- "requires": { +- "@types/body-parser": "*", +- "@types/express-serve-static-core": "^4.17.33", +- "@types/qs": "*", +- "@types/serve-static": "*" +- } +- }, +- "@types/express-serve-static-core": { +- "version": "4.17.41", +- "dev": true, +- "requires": { +- "@types/node": "*", +- "@types/qs": "*", +- "@types/range-parser": "*", +- "@types/send": "*" +- } +- }, +- "@types/fs-extra": { +- "version": "9.0.13", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/geojson": { +- "version": "7946.0.13", +- "dev": true +- }, +- "@types/html-minifier-terser": { +- "version": "6.1.0" +- }, +- "@types/http-cache-semantics": { +- "version": "4.0.4" +- }, +- "@types/http-errors": { +- "version": "2.0.4", +- "dev": true +- }, +- "@types/http-proxy": { +- "version": "1.17.14", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/json-schema": { +- "version": "7.0.15" +- }, +- "@types/json5": { +- "version": "0.0.29", +- "dev": true +- }, +- "@types/keyv": { +- "version": "3.1.4", +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/leaflet": { +- "version": "1.7.11", +- "dev": true, +- "requires": { +- "@types/geojson": "*" +- } +- }, +- "@types/marked": { +- "version": "4.0.8", +- "dev": true +- }, +- "@types/mime": { +- "version": "1.3.5", +- "dev": true +- }, +- "@types/minimist": { +- "version": "1.2.5", +- "dev": true +- }, +- "@types/ms": { +- "version": "0.7.34", +- "dev": true +- }, +- "@types/node": { +- "version": "17.0.45" +- }, +- "@types/node-forge": { +- "version": "1.3.10", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/normalize-package-data": { +- "version": "2.4.4", +- "dev": true +- }, +- "@types/pg": { +- "version": "8.6.6", +- "dev": true, +- "requires": { +- "@types/node": "*", +- "pg-protocol": "*", +- "pg-types": "^2.2.0" +- } +- }, +- "@types/qs": { +- "version": "6.9.10", +- "dev": true +- }, +- "@types/range-parser": { +- "version": "1.2.7", +- "dev": true +- }, +- "@types/responselike": { +- "version": "1.0.3", +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/retry": { +- "version": "0.12.0", +- "dev": true +- }, +- "@types/semver": { +- "version": "7.5.6" +- }, +- "@types/send": { +- "version": "0.17.4", +- "dev": true, +- "requires": { +- "@types/mime": "^1", +- "@types/node": "*" +- } +- }, +- "@types/serve-index": { +- "version": "1.9.4", +- "dev": true, +- "requires": { +- "@types/express": "*" +- } +- }, +- "@types/serve-static": { +- "version": "1.15.5", +- "dev": true, +- "requires": { +- "@types/http-errors": "*", +- "@types/mime": "*", +- "@types/node": "*" +- } +- }, +- "@types/sockjs": { +- "version": "0.3.36", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/ssh2": { +- "version": "1.11.17", +- "dev": true, +- "requires": { +- "@types/node": "^18.11.18" +- }, +- "dependencies": { +- "@types/node": { +- "version": "18.18.13", +- "dev": true, +- "requires": { +- "undici-types": "~5.26.4" +- } +- } +- } +- }, +- "@types/web-bluetooth": { +- "version": "0.0.17" +- }, +- "@types/ws": { +- "version": "8.5.10", +- "dev": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@types/yauzl": { +- "version": "2.10.3", +- "optional": true, +- "requires": { +- "@types/node": "*" +- } +- }, +- "@typescript-eslint/eslint-plugin": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@typescript-eslint/scope-manager": "5.18.0", +- "@typescript-eslint/type-utils": "5.18.0", +- "@typescript-eslint/utils": "5.18.0", +- "debug": "^4.3.2", +- "functional-red-black-tree": "^1.0.1", +- "ignore": "^5.1.8", +- "regexpp": "^3.2.0", +- "semver": "^7.3.5", +- "tsutils": "^3.21.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "@typescript-eslint/parser": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@typescript-eslint/scope-manager": "5.18.0", +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/typescript-estree": "5.18.0", +- "debug": "^4.3.2" +- } +- }, +- "@typescript-eslint/scope-manager": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/visitor-keys": "5.18.0" +- } +- }, +- "@typescript-eslint/type-utils": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@typescript-eslint/utils": "5.18.0", +- "debug": "^4.3.2", +- "tsutils": "^3.21.0" +- } +- }, +- "@typescript-eslint/types": { +- "version": "5.18.0", +- "dev": true +- }, +- "@typescript-eslint/typescript-estree": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/visitor-keys": "5.18.0", +- "debug": "^4.3.2", +- "globby": "^11.0.4", +- "is-glob": "^4.0.3", +- "semver": "^7.3.5", +- "tsutils": "^3.21.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "@typescript-eslint/utils": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@types/json-schema": "^7.0.9", +- "@typescript-eslint/scope-manager": "5.18.0", +- "@typescript-eslint/types": "5.18.0", +- "@typescript-eslint/typescript-estree": "5.18.0", +- "eslint-scope": "^5.1.1", +- "eslint-utils": "^3.0.0" +- } +- }, +- "@typescript-eslint/visitor-keys": { +- "version": "5.18.0", +- "dev": true, +- "requires": { +- "@typescript-eslint/types": "5.18.0", +- "eslint-visitor-keys": "^3.0.0" +- }, +- "dependencies": { +- "eslint-visitor-keys": { +- "version": "3.4.3", +- "dev": true +- } +- } +- }, +- "@vue/compiler-core": { +- "version": "3.2.47", +- "requires": { +- "@babel/parser": "^7.16.4", +- "@vue/shared": "3.2.47", +- "estree-walker": "^2.0.2", +- "source-map": "^0.6.1" +- } +- }, +- "@vue/compiler-dom": { +- "version": "3.2.47", +- "requires": { +- "@vue/compiler-core": "3.2.47", +- "@vue/shared": "3.2.47" +- } +- }, +- "@vue/compiler-sfc": { +- "version": "3.2.47", +- "requires": { +- "@babel/parser": "^7.16.4", +- "@vue/compiler-core": "3.2.47", +- "@vue/compiler-dom": "3.2.47", +- "@vue/compiler-ssr": "3.2.47", +- "@vue/reactivity-transform": "3.2.47", +- "@vue/shared": "3.2.47", +- "estree-walker": "^2.0.2", +- "magic-string": "^0.25.7", +- "postcss": "^8.1.10", +- "source-map": "^0.6.1" +- } +- }, +- "@vue/compiler-ssr": { +- "version": "3.2.47", +- "requires": { +- "@vue/compiler-dom": "3.2.47", +- "@vue/shared": "3.2.47" +- } +- }, +- "@vue/devtools-api": { +- "version": "6.5.1" +- }, +- "@vue/reactivity": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz", +- "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==", +- "requires": { +- "@vue/shared": "3.4.27" +- }, +- "dependencies": { +- "@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- } +- } +- }, +- "@vue/reactivity-transform": { +- "version": "3.2.47", +- "requires": { +- "@babel/parser": "^7.16.4", +- "@vue/compiler-core": "3.2.47", +- "@vue/shared": "3.2.47", +- "estree-walker": "^2.0.2", +- "magic-string": "^0.25.7" +- } +- }, +- "@vue/runtime-core": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz", +- "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==", +- "requires": { +- "@vue/reactivity": "3.4.27", +- "@vue/shared": "3.4.27" +- }, +- "dependencies": { +- "@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- } +- } +- }, +- "@vue/runtime-dom": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz", +- "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==", +- "requires": { +- "@vue/runtime-core": "3.4.27", +- "@vue/shared": "3.4.27", +- "csstype": "^3.1.3" +- }, +- "dependencies": { +- "@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- } +- } +- }, +- "@vue/server-renderer": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz", +- "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==", +- "requires": { +- "@vue/compiler-ssr": "3.4.27", +- "@vue/shared": "3.4.27" +- }, +- "dependencies": { +- "@vue/compiler-core": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz", +- "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==", +- "requires": { +- "@babel/parser": "^7.24.4", +- "@vue/shared": "3.4.27", +- "entities": "^4.5.0", +- "estree-walker": "^2.0.2", +- "source-map-js": "^1.2.0" +- } +- }, +- "@vue/compiler-dom": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz", +- "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==", +- "requires": { +- "@vue/compiler-core": "3.4.27", +- "@vue/shared": "3.4.27" +- } +- }, +- "@vue/compiler-ssr": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz", +- "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==", +- "requires": { +- "@vue/compiler-dom": "3.4.27", +- "@vue/shared": "3.4.27" +- } +- }, +- "@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- } +- } +- }, +- "@vue/shared": { +- "version": "3.2.47" +- }, +- "@vueuse/core": { +- "version": "10.4.1", +- "requires": { +- "@types/web-bluetooth": "^0.0.17", +- "@vueuse/metadata": "10.4.1", +- "@vueuse/shared": "10.4.1", +- "vue-demi": ">=0.14.5" +- }, +- "dependencies": { +- "vue-demi": { +- "version": "0.14.6", +- "requires": {} +- } +- } +- }, +- "@vueuse/metadata": { +- "version": "10.4.1" +- }, +- "@vueuse/shared": { +- "version": "10.4.1", +- "requires": { +- "vue-demi": ">=0.14.5" +- }, +- "dependencies": { +- "vue-demi": { +- "version": "0.14.6", +- "requires": {} +- } +- } +- }, +- "@webassemblyjs/ast": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/helper-numbers": "1.11.6", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6" +- } +- }, +- "@webassemblyjs/floating-point-hex-parser": { +- "version": "1.11.6" +- }, +- "@webassemblyjs/helper-api-error": { +- "version": "1.11.6" +- }, +- "@webassemblyjs/helper-buffer": { +- "version": "1.12.1" +- }, +- "@webassemblyjs/helper-numbers": { +- "version": "1.11.6", +- "requires": { +- "@webassemblyjs/floating-point-hex-parser": "1.11.6", +- "@webassemblyjs/helper-api-error": "1.11.6", +- "@xtuc/long": "4.2.2" +- } +- }, +- "@webassemblyjs/helper-wasm-bytecode": { +- "version": "1.11.6" +- }, +- "@webassemblyjs/helper-wasm-section": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-buffer": "1.12.1", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", +- "@webassemblyjs/wasm-gen": "1.12.1" +- } +- }, +- "@webassemblyjs/ieee754": { +- "version": "1.11.6", +- "requires": { +- "@xtuc/ieee754": "^1.2.0" +- } +- }, +- "@webassemblyjs/leb128": { +- "version": "1.11.6", +- "requires": { +- "@xtuc/long": "4.2.2" +- } +- }, +- "@webassemblyjs/utf8": { +- "version": "1.11.6" +- }, +- "@webassemblyjs/wasm-edit": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-buffer": "1.12.1", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", +- "@webassemblyjs/helper-wasm-section": "1.12.1", +- "@webassemblyjs/wasm-gen": "1.12.1", +- "@webassemblyjs/wasm-opt": "1.12.1", +- "@webassemblyjs/wasm-parser": "1.12.1", +- "@webassemblyjs/wast-printer": "1.12.1" +- } +- }, +- "@webassemblyjs/wasm-gen": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", +- "@webassemblyjs/ieee754": "1.11.6", +- "@webassemblyjs/leb128": "1.11.6", +- "@webassemblyjs/utf8": "1.11.6" +- } +- }, +- "@webassemblyjs/wasm-opt": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-buffer": "1.12.1", +- "@webassemblyjs/wasm-gen": "1.12.1", +- "@webassemblyjs/wasm-parser": "1.12.1" +- } +- }, +- "@webassemblyjs/wasm-parser": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/ast": "1.12.1", +- "@webassemblyjs/helper-api-error": "1.11.6", +- "@webassemblyjs/helper-wasm-bytecode": "1.11.6", +- "@webassemblyjs/ieee754": "1.11.6", +- "@webassemblyjs/leb128": "1.11.6", +- "@webassemblyjs/utf8": "1.11.6" +- } +- }, +- "@webassemblyjs/wast-printer": { +- "version": "1.12.1", +- "requires": { +- "@webassemblyjs/ast": "1.12.1", +- "@xtuc/long": "4.2.2" +- } +- }, +- "@webpack-cli/configtest": { +- "version": "1.2.0", +- "requires": {} +- }, +- "@webpack-cli/info": { +- "version": "1.5.0", +- "requires": { +- "envinfo": "^7.7.3" +- } +- }, +- "@webpack-cli/serve": { +- "version": "1.7.0", +- "requires": {} +- }, +- "@xmldom/xmldom": { +- "version": "0.8.10", +- "dev": true +- }, +- "@xtuc/ieee754": { +- "version": "1.2.0" +- }, +- "@xtuc/long": { +- "version": "4.2.2" +- }, +- "7zip-bin": { +- "version": "5.2.0", +- "dev": true +- }, +- "accepts": { +- "version": "1.3.8", +- "dev": true, +- "requires": { +- "mime-types": "~2.1.34", +- "negotiator": "0.6.3" +- } +- }, +- "ace-builds": { +- "version": "1.34.1", +- "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.1.tgz", +- "integrity": "sha512-hwRzr6BkRwsq5A19yA9E36KNNtn0+zESYolnWK3TADJsWVQS0T24nvbgdjXwqk2JEMQXE4PlqAw+ZgprvFtKjw==" +- }, +- "acorn": { +- "version": "7.4.1", +- "dev": true +- }, +- "acorn-jsx": { +- "version": "5.3.2", +- "dev": true, +- "requires": {} +- }, +- "acorn-walk": { +- "version": "8.3.0", +- "dev": true +- }, +- "add-stream": { +- "version": "1.0.0", +- "dev": true +- }, +- "agent-base": { +- "version": "6.0.2", +- "dev": true, +- "requires": { +- "debug": "4" +- } +- }, +- "ajv": { +- "version": "6.12.6", +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "fast-json-stable-stringify": "^2.0.0", +- "json-schema-traverse": "^0.4.1", +- "uri-js": "^4.2.2" +- } +- }, +- "ajv-formats": { +- "version": "2.1.1", +- "requires": { +- "ajv": "^8.0.0" +- }, +- "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0" +- } +- } +- }, +- "ajv-keywords": { +- "version": "3.5.2", +- "requires": {} +- }, +- "all-contributors-cli": { +- "version": "6.20.5", +- "dev": true, +- "requires": { +- "@babel/runtime": "^7.7.6", +- "async": "^3.1.0", +- "chalk": "^4.0.0", +- "didyoumean": "^1.2.1", +- "inquirer": "^7.3.3", +- "json-fixer": "^1.6.8", +- "lodash": "^4.11.2", +- "node-fetch": "^2.6.0", +- "pify": "^5.0.0", +- "yargs": "^15.0.1" +- } +- }, +- "ansi-colors": { +- "version": "4.1.3", +- "dev": true +- }, +- "ansi-escapes": { +- "version": "4.3.2", +- "dev": true, +- "requires": { +- "type-fest": "^0.21.3" +- }, +- "dependencies": { +- "type-fest": { +- "version": "0.21.3", +- "dev": true +- } +- } +- }, +- "ansi-html-community": { +- "version": "0.0.8", +- "dev": true +- }, +- "ansi-regex": { +- "version": "5.0.1" +- }, +- "ansi-styles": { +- "version": "4.3.0", +- "requires": { +- "color-convert": "^2.0.1" +- } +- }, +- "anymatch": { +- "version": "3.1.3", +- "requires": { +- "normalize-path": "^3.0.0", +- "picomatch": "^2.0.4" +- } +- }, +- "app-builder-bin": { +- "version": "4.0.0", +- "dev": true +- }, +- "app-builder-lib": { +- "version": "24.13.3", +- "dev": true, +- "requires": { +- "@develar/schema-utils": "~2.6.5", +- "@electron/notarize": "2.2.1", +- "@electron/osx-sign": "1.0.5", +- "@electron/universal": "1.5.1", +- "@malept/flatpak-bundler": "^0.4.0", +- "@types/fs-extra": "9.0.13", +- "async-exit-hook": "^2.0.1", +- "bluebird-lst": "^1.0.9", +- "builder-util": "24.13.1", +- "builder-util-runtime": "9.2.4", +- "chromium-pickle-js": "^0.2.0", +- "debug": "^4.3.4", +- "ejs": "^3.1.8", +- "electron-publish": "24.13.1", +- "form-data": "^4.0.0", +- "fs-extra": "^10.1.0", +- "hosted-git-info": "^4.1.0", +- "is-ci": "^3.0.0", +- "isbinaryfile": "^5.0.0", +- "js-yaml": "^4.1.0", +- "lazy-val": "^1.0.5", +- "minimatch": "^5.1.1", +- "read-config-file": "6.3.2", +- "sanitize-filename": "^1.6.3", +- "semver": "^7.3.8", +- "tar": "^6.1.12", +- "temp-file": "^3.4.0" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "semver": { +- "version": "7.6.2", +- "dev": true +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "archiver": { +- "version": "5.3.2", +- "dev": true, +- "peer": true, +- "requires": { +- "archiver-utils": "^2.1.0", +- "async": "^3.2.4", +- "buffer-crc32": "^0.2.1", +- "readable-stream": "^3.6.0", +- "readdir-glob": "^1.1.2", +- "tar-stream": "^2.2.0", +- "zip-stream": "^4.1.0" +- } +- }, +- "archiver-utils": { +- "version": "2.1.0", +- "dev": true, +- "peer": true, +- "requires": { +- "glob": "^7.1.4", +- "graceful-fs": "^4.2.0", +- "lazystream": "^1.0.0", +- "lodash.defaults": "^4.2.0", +- "lodash.difference": "^4.5.0", +- "lodash.flatten": "^4.4.0", +- "lodash.isplainobject": "^4.0.6", +- "lodash.union": "^4.6.0", +- "normalize-path": "^3.0.0", +- "readable-stream": "^2.0.0" +- }, +- "dependencies": { +- "isarray": { +- "version": "1.0.0", +- "dev": true, +- "peer": true +- }, +- "readable-stream": { +- "version": "2.3.8", +- "dev": true, +- "peer": true, +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "dev": true, +- "peer": true +- }, +- "string_decoder": { +- "version": "1.1.1", +- "dev": true, +- "peer": true, +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- } +- } +- }, +- "arg": { +- "version": "4.1.3", +- "dev": true +- }, +- "argparse": { +- "version": "2.0.1" +- }, +- "array-buffer-byte-length": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "is-array-buffer": "^3.0.1" +- } +- }, +- "array-flatten": { +- "version": "2.1.2", +- "dev": true +- }, +- "array-ify": { +- "version": "1.0.0", +- "dev": true +- }, +- "array-includes": { +- "version": "3.1.7", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1", +- "get-intrinsic": "^1.2.1", +- "is-string": "^1.0.7" +- } +- }, +- "array-union": { +- "version": "2.1.0", +- "dev": true +- }, +- "array.prototype.flat": { +- "version": "1.3.2", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1", +- "es-shim-unscopables": "^1.0.0" +- } +- }, +- "arraybuffer.prototype.slice": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "array-buffer-byte-length": "^1.0.0", +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1", +- "get-intrinsic": "^1.2.1", +- "is-array-buffer": "^3.0.2", +- "is-shared-array-buffer": "^1.0.2" +- } +- }, +- "arrify": { +- "version": "1.0.1", +- "dev": true +- }, +- "asn1": { +- "version": "0.2.6", +- "requires": { +- "safer-buffer": "~2.1.0" +- } +- }, +- "astral-regex": { +- "version": "2.0.0", +- "dev": true +- }, +- "async": { +- "version": "3.2.5", +- "dev": true +- }, +- "async-exit-hook": { +- "version": "2.0.1", +- "dev": true +- }, +- "asynckit": { +- "version": "0.4.0", +- "dev": true +- }, +- "at-least-node": { +- "version": "1.0.0", +- "dev": true +- }, +- "atomically": { +- "version": "1.7.0" +- }, +- "available-typed-arrays": { +- "version": "1.0.5", +- "dev": true +- }, +- "babel-loader": { +- "version": "8.2.5", +- "requires": { +- "find-cache-dir": "^3.3.1", +- "loader-utils": "^2.0.0", +- "make-dir": "^3.1.0", +- "schema-utils": "^2.6.5" +- } +- }, +- "babel-plugin-polyfill-corejs2": { +- "version": "0.2.3", +- "dev": true, +- "requires": { +- "@babel/compat-data": "^7.13.11", +- "@babel/helper-define-polyfill-provider": "^0.2.4", +- "semver": "^6.1.1" +- } +- }, +- "babel-plugin-polyfill-corejs3": { +- "version": "0.2.5", +- "dev": true, +- "requires": { +- "@babel/helper-define-polyfill-provider": "^0.2.2", +- "core-js-compat": "^3.16.2" +- } +- }, +- "babel-plugin-polyfill-regenerator": { +- "version": "0.2.3", +- "dev": true, +- "requires": { +- "@babel/helper-define-polyfill-provider": "^0.2.4" +- } +- }, +- "balanced-match": { +- "version": "1.0.2" +- }, +- "base64-js": { +- "version": "1.5.1" +- }, +- "batch": { +- "version": "0.6.1", +- "dev": true +- }, +- "bcrypt-pbkdf": { +- "version": "1.0.2", +- "requires": { +- "tweetnacl": "^0.14.3" +- } +- }, +- "better-sqlite3": { +- "version": "10.0.0", +- "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-10.0.0.tgz", +- "integrity": "sha512-rOz0JY8bt9oMgrFssP7GnvA5R3yln73y/NizzWqy3WlFth8Ux8+g4r/N9fjX97nn4X1YX6MTER2doNpTu5pqiA==", +- "requires": { +- "bindings": "^1.5.0", +- "prebuild-install": "^7.1.1" +- } +- }, +- "big-integer": { +- "version": "1.6.52" +- }, +- "big.js": { +- "version": "5.2.2" +- }, +- "binary-extensions": { +- "version": "2.2.0" +- }, +- "bindings": { +- "version": "1.5.0", +- "requires": { +- "file-uri-to-path": "1.0.0" +- } +- }, +- "bl": { +- "version": "4.1.0", +- "requires": { +- "buffer": "^5.5.0", +- "inherits": "^2.0.4", +- "readable-stream": "^3.4.0" +- } +- }, +- "bluebird": { +- "version": "3.7.2", +- "dev": true +- }, +- "bluebird-lst": { +- "version": "1.0.9", +- "dev": true, +- "requires": { +- "bluebird": "^3.5.5" +- } +- }, +- "body-parser": { +- "version": "1.20.2", +- "dev": true, +- "requires": { +- "bytes": "3.1.2", +- "content-type": "~1.0.5", +- "debug": "2.6.9", +- "depd": "2.0.0", +- "destroy": "1.2.0", +- "http-errors": "2.0.0", +- "iconv-lite": "0.4.24", +- "on-finished": "2.4.1", +- "qs": "6.11.0", +- "raw-body": "2.5.2", +- "type-is": "~1.6.18", +- "unpipe": "1.0.0" +- }, +- "dependencies": { +- "bytes": { +- "version": "3.1.2", +- "dev": true +- }, +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "iconv-lite": { +- "version": "0.4.24", +- "dev": true, +- "requires": { +- "safer-buffer": ">= 2.1.2 < 3" +- } +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- } +- } +- }, +- "bonjour-service": { +- "version": "1.1.1", +- "dev": true, +- "requires": { +- "array-flatten": "^2.1.2", +- "dns-equal": "^1.0.0", +- "fast-deep-equal": "^3.1.3", +- "multicast-dns": "^7.2.5" +- } +- }, +- "boolbase": { +- "version": "1.0.0" +- }, +- "boolean": { +- "version": "3.2.0", +- "optional": true +- }, +- "brace-expansion": { +- "version": "2.0.1", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0" +- } +- }, +- "braces": { +- "version": "3.0.2", +- "requires": { +- "fill-range": "^7.0.1" +- } +- }, +- "browserslist": { +- "version": "4.22.1", +- "requires": { +- "caniuse-lite": "^1.0.30001541", +- "electron-to-chromium": "^1.4.535", +- "node-releases": "^2.0.13", +- "update-browserslist-db": "^1.0.13" +- } +- }, +- "buffer": { +- "version": "5.7.1", +- "requires": { +- "base64-js": "^1.3.1", +- "ieee754": "^1.1.13" +- } +- }, +- "buffer-crc32": { +- "version": "0.2.13" +- }, +- "buffer-equal": { +- "version": "1.0.1", +- "dev": true +- }, +- "buffer-from": { +- "version": "1.1.2" +- }, +- "buildcheck": { +- "version": "0.0.6" +- }, +- "builder-util": { +- "version": "24.13.1", +- "dev": true, +- "requires": { +- "@types/debug": "^4.1.6", +- "7zip-bin": "~5.2.0", +- "app-builder-bin": "4.0.0", +- "bluebird-lst": "^1.0.9", +- "builder-util-runtime": "9.2.4", +- "chalk": "^4.1.2", +- "cross-spawn": "^7.0.3", +- "debug": "^4.3.4", +- "fs-extra": "^10.1.0", +- "http-proxy-agent": "^5.0.0", +- "https-proxy-agent": "^5.0.1", +- "is-ci": "^3.0.0", +- "js-yaml": "^4.1.0", +- "source-map-support": "^0.5.19", +- "stat-mode": "^1.0.0", +- "temp-file": "^3.4.0" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "builder-util-runtime": { +- "version": "9.2.4", +- "dev": true, +- "requires": { +- "debug": "^4.3.4", +- "sax": "^1.2.4" +- } +- }, +- "bytes": { +- "version": "3.0.0", +- "dev": true +- }, +- "cacheable-lookup": { +- "version": "5.0.4" +- }, +- "cacheable-request": { +- "version": "7.0.4", +- "requires": { +- "clone-response": "^1.0.2", +- "get-stream": "^5.1.0", +- "http-cache-semantics": "^4.0.0", +- "keyv": "^4.0.0", +- "lowercase-keys": "^2.0.0", +- "normalize-url": "^6.0.1", +- "responselike": "^2.0.0" +- } +- }, +- "call-bind": { +- "version": "1.0.5", +- "dev": true, +- "requires": { +- "function-bind": "^1.1.2", +- "get-intrinsic": "^1.2.1", +- "set-function-length": "^1.1.1" +- } +- }, +- "callsites": { +- "version": "3.1.0", +- "dev": true +- }, +- "camel-case": { +- "version": "4.1.2", +- "requires": { +- "pascal-case": "^3.1.2", +- "tslib": "^2.0.3" +- } +- }, +- "camelcase": { +- "version": "5.3.1", +- "dev": true +- }, +- "camelcase-keys": { +- "version": "6.2.2", +- "dev": true, +- "requires": { +- "camelcase": "^5.3.1", +- "map-obj": "^4.0.0", +- "quick-lru": "^4.0.1" +- }, +- "dependencies": { +- "quick-lru": { +- "version": "4.0.1", +- "dev": true +- } +- } +- }, +- "caniuse-lite": { +- "version": "1.0.30001564" +- }, +- "chalk": { +- "version": "4.1.2", +- "requires": { +- "ansi-styles": "^4.1.0", +- "supports-color": "^7.1.0" +- } +- }, +- "chardet": { +- "version": "0.7.0", +- "dev": true +- }, +- "chokidar": { +- "version": "3.5.3", +- "requires": { +- "anymatch": "~3.1.2", +- "braces": "~3.0.2", +- "fsevents": "~2.3.2", +- "glob-parent": "~5.1.2", +- "is-binary-path": "~2.1.0", +- "is-glob": "~4.0.1", +- "normalize-path": "~3.0.0", +- "readdirp": "~3.6.0" +- } +- }, +- "chownr": { +- "version": "2.0.0", +- "dev": true +- }, +- "chrome-trace-event": { +- "version": "1.0.3" +- }, +- "chromium-pickle-js": { +- "version": "0.2.0", +- "dev": true +- }, +- "ci-info": { +- "version": "3.9.0", +- "dev": true +- }, +- "clean-css": { +- "version": "5.3.2", +- "requires": { +- "source-map": "~0.6.0" +- } +- }, +- "cli-cursor": { +- "version": "3.1.0", +- "dev": true, +- "requires": { +- "restore-cursor": "^3.1.0" +- } +- }, +- "cli-width": { +- "version": "3.0.0", +- "dev": true +- }, +- "cliui": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "string-width": "^4.2.0", +- "strip-ansi": "^6.0.0", +- "wrap-ansi": "^6.2.0" +- }, +- "dependencies": { +- "wrap-ansi": { +- "version": "6.2.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- } +- } +- } +- }, +- "clone-deep": { +- "version": "4.0.1", +- "requires": { +- "is-plain-object": "^2.0.4", +- "kind-of": "^6.0.2", +- "shallow-clone": "^3.0.0" +- }, +- "dependencies": { +- "is-plain-object": { +- "version": "2.0.4", +- "requires": { +- "isobject": "^3.0.1" +- } +- } +- } +- }, +- "clone-response": { +- "version": "1.0.3", +- "requires": { +- "mimic-response": "^1.0.0" +- } +- }, +- "color-convert": { +- "version": "2.0.1", +- "requires": { +- "color-name": "~1.1.4" +- } +- }, +- "color-name": { +- "version": "1.1.4" +- }, +- "colord": { +- "version": "2.9.3", +- "dev": true +- }, +- "colorette": { +- "version": "2.0.20" +- }, +- "combined-stream": { +- "version": "1.0.8", +- "dev": true, +- "requires": { +- "delayed-stream": "~1.0.0" +- } +- }, +- "commander": { +- "version": "5.1.0", +- "dev": true +- }, +- "commondir": { +- "version": "1.0.1" +- }, +- "compare-func": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "array-ify": "^1.0.0", +- "dot-prop": "^5.1.0" +- }, +- "dependencies": { +- "dot-prop": { +- "version": "5.3.0", +- "dev": true, +- "requires": { +- "is-obj": "^2.0.0" +- } +- } +- } +- }, +- "compare-version": { +- "version": "0.1.2", +- "dev": true +- }, +- "compress-commons": { +- "version": "4.1.2", +- "dev": true, +- "peer": true, +- "requires": { +- "buffer-crc32": "^0.2.13", +- "crc32-stream": "^4.0.2", +- "normalize-path": "^3.0.0", +- "readable-stream": "^3.6.0" +- } +- }, +- "compressible": { +- "version": "2.0.18", +- "dev": true, +- "requires": { +- "mime-db": ">= 1.43.0 < 2" +- } +- }, +- "compression": { +- "version": "1.7.4", +- "dev": true, +- "requires": { +- "accepts": "~1.3.5", +- "bytes": "3.0.0", +- "compressible": "~2.0.16", +- "debug": "2.6.9", +- "on-headers": "~1.0.2", +- "safe-buffer": "5.1.2", +- "vary": "~1.1.2" +- }, +- "dependencies": { +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "dev": true +- } +- } +- }, +- "concat-map": { +- "version": "0.0.1" +- }, +- "concat-stream": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "buffer-from": "^1.0.0", +- "inherits": "^2.0.3", +- "readable-stream": "^3.0.2", +- "typedarray": "^0.0.6" +- } +- }, +- "conf": { +- "version": "10.2.0", +- "requires": { +- "ajv": "^8.6.3", +- "ajv-formats": "^2.1.1", +- "atomically": "^1.7.0", +- "debounce-fn": "^4.0.0", +- "dot-prop": "^6.0.1", +- "env-paths": "^2.2.1", +- "json-schema-typed": "^7.0.3", +- "onetime": "^5.1.2", +- "pkg-up": "^3.1.0", +- "semver": "^7.3.5" +- }, +- "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0" +- }, +- "lru-cache": { +- "version": "6.0.0", +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0" +- } +- } +- }, +- "config-file-ts": { +- "version": "0.2.6", +- "dev": true, +- "requires": { +- "glob": "^10.3.10", +- "typescript": "^5.3.3" +- }, +- "dependencies": { +- "glob": { +- "version": "10.3.15", +- "dev": true, +- "requires": { +- "foreground-child": "^3.1.0", +- "jackspeak": "^2.3.6", +- "minimatch": "^9.0.1", +- "minipass": "^7.0.4", +- "path-scurry": "^1.11.0" +- } +- }, +- "minimatch": { +- "version": "9.0.4", +- "dev": true, +- "requires": { +- "brace-expansion": "^2.0.1" +- } +- }, +- "minipass": { +- "version": "7.1.1", +- "dev": true +- }, +- "typescript": { +- "version": "5.4.5", +- "dev": true +- } +- } +- }, +- "connect-history-api-fallback": { +- "version": "2.0.0", +- "dev": true +- }, +- "content-disposition": { +- "version": "0.5.4", +- "dev": true, +- "requires": { +- "safe-buffer": "5.2.1" +- } +- }, +- "content-type": { +- "version": "1.0.5", +- "dev": true +- }, +- "conventional-changelog": { +- "version": "3.1.24", +- "dev": true, +- "requires": { +- "conventional-changelog-angular": "^5.0.12", +- "conventional-changelog-atom": "^2.0.8", +- "conventional-changelog-codemirror": "^2.0.8", +- "conventional-changelog-conventionalcommits": "^4.5.0", +- "conventional-changelog-core": "^4.2.1", +- "conventional-changelog-ember": "^2.0.9", +- "conventional-changelog-eslint": "^3.0.9", +- "conventional-changelog-express": "^2.0.6", +- "conventional-changelog-jquery": "^3.0.11", +- "conventional-changelog-jshint": "^2.0.9", +- "conventional-changelog-preset-loader": "^2.3.4" +- } +- }, +- "conventional-changelog-angular": { +- "version": "5.0.13", +- "dev": true, +- "requires": { +- "compare-func": "^2.0.0", +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-atom": { +- "version": "2.0.8", +- "dev": true, +- "requires": { +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-codemirror": { +- "version": "2.0.8", +- "dev": true, +- "requires": { +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-config-spec": { +- "version": "2.1.0", +- "dev": true +- }, +- "conventional-changelog-conventionalcommits": { +- "version": "4.6.1", +- "dev": true, +- "requires": { +- "compare-func": "^2.0.0", +- "lodash": "^4.17.15", +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-core": { +- "version": "4.2.4", +- "dev": true, +- "requires": { +- "add-stream": "^1.0.0", +- "conventional-changelog-writer": "^5.0.0", +- "conventional-commits-parser": "^3.2.0", +- "dateformat": "^3.0.0", +- "get-pkg-repo": "^4.0.0", +- "git-raw-commits": "^2.0.8", +- "git-remote-origin-url": "^2.0.0", +- "git-semver-tags": "^4.1.1", +- "lodash": "^4.17.15", +- "normalize-package-data": "^3.0.0", +- "q": "^1.5.1", +- "read-pkg": "^3.0.0", +- "read-pkg-up": "^3.0.0", +- "through2": "^4.0.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "normalize-package-data": { +- "version": "3.0.3", +- "dev": true, +- "requires": { +- "hosted-git-info": "^4.0.1", +- "is-core-module": "^2.5.0", +- "semver": "^7.3.4", +- "validate-npm-package-license": "^3.0.1" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "conventional-changelog-ember": { +- "version": "2.0.9", +- "dev": true, +- "requires": { +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-eslint": { +- "version": "3.0.9", +- "dev": true, +- "requires": { +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-express": { +- "version": "2.0.6", +- "dev": true, +- "requires": { +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-jquery": { +- "version": "3.0.11", +- "dev": true, +- "requires": { +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-jshint": { +- "version": "2.0.9", +- "dev": true, +- "requires": { +- "compare-func": "^2.0.0", +- "q": "^1.5.1" +- } +- }, +- "conventional-changelog-preset-loader": { +- "version": "2.3.4", +- "dev": true +- }, +- "conventional-changelog-writer": { +- "version": "5.0.1", +- "dev": true, +- "requires": { +- "conventional-commits-filter": "^2.0.7", +- "dateformat": "^3.0.0", +- "handlebars": "^4.7.7", +- "json-stringify-safe": "^5.0.1", +- "lodash": "^4.17.15", +- "meow": "^8.0.0", +- "semver": "^6.0.0", +- "split": "^1.0.0", +- "through2": "^4.0.0" +- } +- }, +- "conventional-commits-filter": { +- "version": "2.0.7", +- "dev": true, +- "requires": { +- "lodash.ismatch": "^4.4.0", +- "modify-values": "^1.0.0" +- } +- }, +- "conventional-commits-parser": { +- "version": "3.2.4", +- "dev": true, +- "requires": { +- "is-text-path": "^1.0.1", +- "JSONStream": "^1.0.4", +- "lodash": "^4.17.15", +- "meow": "^8.0.0", +- "split2": "^3.0.0", +- "through2": "^4.0.0" +- }, +- "dependencies": { +- "split2": { +- "version": "3.2.2", +- "dev": true, +- "requires": { +- "readable-stream": "^3.0.0" +- } +- } +- } +- }, +- "conventional-recommended-bump": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "concat-stream": "^2.0.0", +- "conventional-changelog-preset-loader": "^2.3.4", +- "conventional-commits-filter": "^2.0.7", +- "conventional-commits-parser": "^3.2.0", +- "git-raw-commits": "^2.0.8", +- "git-semver-tags": "^4.1.1", +- "meow": "^8.0.0", +- "q": "^1.5.1" +- } +- }, +- "convert-source-map": { +- "version": "2.0.0", +- "peer": true +- }, +- "cookie": { +- "version": "0.6.0", +- "dev": true +- }, +- "cookie-signature": { +- "version": "1.0.6", +- "dev": true +- }, +- "core-js-compat": { +- "version": "3.33.3", +- "dev": true, +- "requires": { +- "browserslist": "^4.22.1" +- } +- }, +- "core-util-is": { +- "version": "1.0.2" +- }, +- "cpu-features": { +- "version": "0.0.10", +- "requires": { +- "buildcheck": "~0.0.6", +- "nan": "^2.19.0" +- } +- }, +- "crc-32": { +- "version": "1.2.2", +- "dev": true, +- "peer": true +- }, +- "crc32-stream": { +- "version": "4.0.3", +- "dev": true, +- "peer": true, +- "requires": { +- "crc-32": "^1.2.0", +- "readable-stream": "^3.4.0" +- } +- }, +- "create-require": { +- "version": "1.1.1", +- "dev": true +- }, +- "cross-env": { +- "version": "7.0.3", +- "requires": { +- "cross-spawn": "^7.0.1" +- } +- }, +- "cross-spawn": { +- "version": "7.0.3", +- "requires": { +- "path-key": "^3.1.0", +- "shebang-command": "^2.0.0", +- "which": "^2.0.1" +- } +- }, +- "css-functions-list": { +- "version": "3.2.1", +- "dev": true +- }, +- "css-loader": { +- "version": "6.5.1", +- "requires": { +- "icss-utils": "^5.1.0", +- "postcss": "^8.2.15", +- "postcss-modules-extract-imports": "^3.0.0", +- "postcss-modules-local-by-default": "^4.0.0", +- "postcss-modules-scope": "^3.0.0", +- "postcss-modules-values": "^4.0.0", +- "postcss-value-parser": "^4.1.0", +- "semver": "^7.3.5" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0" +- } +- } +- }, +- "css-select": { +- "version": "4.3.0", +- "requires": { +- "boolbase": "^1.0.0", +- "css-what": "^6.0.1", +- "domhandler": "^4.3.1", +- "domutils": "^2.8.0", +- "nth-check": "^2.0.1" +- }, +- "dependencies": { +- "dom-serializer": { +- "version": "1.4.1", +- "requires": { +- "domelementtype": "^2.0.1", +- "domhandler": "^4.2.0", +- "entities": "^2.0.0" +- } +- }, +- "domhandler": { +- "version": "4.3.1", +- "requires": { +- "domelementtype": "^2.2.0" +- } +- }, +- "domutils": { +- "version": "2.8.0", +- "requires": { +- "dom-serializer": "^1.0.1", +- "domelementtype": "^2.2.0", +- "domhandler": "^4.2.0" +- } +- }, +- "entities": { +- "version": "2.2.0" +- } +- } +- }, +- "css-tree": { +- "version": "2.3.1", +- "dev": true, +- "requires": { +- "mdn-data": "2.0.30", +- "source-map-js": "^1.0.1" +- } +- }, +- "css-what": { +- "version": "6.1.0" +- }, +- "cssesc": { +- "version": "3.0.0" +- }, +- "csstype": { +- "version": "3.1.3", +- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", +- "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" +- }, +- "dargs": { +- "version": "7.0.0", +- "dev": true +- }, +- "dateformat": { +- "version": "3.0.3", +- "dev": true +- }, +- "debounce-fn": { +- "version": "4.0.0", +- "requires": { +- "mimic-fn": "^3.0.0" +- } +- }, +- "debug": { +- "version": "4.3.4", +- "requires": { +- "ms": "2.1.2" +- } +- }, +- "decamelize": { +- "version": "1.2.0", +- "dev": true +- }, +- "decamelize-keys": { +- "version": "1.1.1", +- "dev": true, +- "requires": { +- "decamelize": "^1.1.0", +- "map-obj": "^1.0.0" +- }, +- "dependencies": { +- "map-obj": { +- "version": "1.0.1", +- "dev": true +- } +- } +- }, +- "decompress-response": { +- "version": "6.0.0", +- "requires": { +- "mimic-response": "^3.1.0" +- }, +- "dependencies": { +- "mimic-response": { +- "version": "3.1.0" +- } +- } +- }, +- "deep-extend": { +- "version": "0.6.0" +- }, +- "deep-is": { +- "version": "0.1.4", +- "dev": true +- }, +- "default-gateway": { +- "version": "6.0.3", +- "dev": true, +- "requires": { +- "execa": "^5.0.0" +- } +- }, +- "defer-to-connect": { +- "version": "2.0.1" +- }, +- "define-data-property": { +- "version": "1.1.1", +- "devOptional": true, +- "requires": { +- "get-intrinsic": "^1.2.1", +- "gopd": "^1.0.1", +- "has-property-descriptors": "^1.0.0" +- } +- }, +- "define-lazy-prop": { +- "version": "2.0.0", +- "dev": true +- }, +- "define-properties": { +- "version": "1.2.1", +- "devOptional": true, +- "requires": { +- "define-data-property": "^1.0.1", +- "has-property-descriptors": "^1.0.0", +- "object-keys": "^1.1.1" +- } +- }, +- "delayed-stream": { +- "version": "1.0.0", +- "dev": true +- }, +- "denque": { +- "version": "2.1.0" +- }, +- "depd": { +- "version": "2.0.0", +- "dev": true +- }, +- "destroy": { +- "version": "1.2.0", +- "dev": true +- }, +- "detect-indent": { +- "version": "6.1.0", +- "dev": true +- }, +- "detect-libc": { +- "version": "2.0.2" +- }, +- "detect-newline": { +- "version": "3.1.0", +- "dev": true +- }, +- "detect-node": { +- "version": "2.1.0", +- "devOptional": true +- }, +- "didyoumean": { +- "version": "1.2.2", +- "dev": true +- }, +- "diff": { +- "version": "4.0.2", +- "dev": true +- }, +- "dir-compare": { +- "version": "3.3.0", +- "dev": true, +- "requires": { +- "buffer-equal": "^1.0.0", +- "minimatch": "^3.0.4" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- } +- } +- }, +- "dir-glob": { +- "version": "3.0.1", +- "dev": true, +- "requires": { +- "path-type": "^4.0.0" +- } +- }, +- "discontinuous-range": { +- "version": "1.0.0" +- }, +- "dmg-builder": { +- "version": "24.13.3", +- "dev": true, +- "requires": { +- "app-builder-lib": "24.13.3", +- "builder-util": "24.13.1", +- "builder-util-runtime": "9.2.4", +- "dmg-license": "^1.0.11", +- "fs-extra": "^10.1.0", +- "iconv-lite": "^0.6.2", +- "js-yaml": "^4.1.0" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "dns-equal": { +- "version": "1.0.0", +- "dev": true +- }, +- "dns-packet": { +- "version": "5.6.1", +- "dev": true, +- "requires": { +- "@leichtgewicht/ip-codec": "^2.0.1" +- } +- }, +- "doctrine": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "esutils": "^2.0.2" +- } +- }, +- "dom-converter": { +- "version": "0.2.0", +- "requires": { +- "utila": "~0.4" +- } +- }, +- "dom-serializer": { +- "version": "2.0.0", +- "requires": { +- "domelementtype": "^2.3.0", +- "domhandler": "^5.0.2", +- "entities": "^4.2.0" +- } +- }, +- "domelementtype": { +- "version": "2.3.0" +- }, +- "domhandler": { +- "version": "5.0.3", +- "requires": { +- "domelementtype": "^2.3.0" +- } +- }, +- "domutils": { +- "version": "3.1.0", +- "requires": { +- "dom-serializer": "^2.0.0", +- "domelementtype": "^2.3.0", +- "domhandler": "^5.0.3" +- } +- }, +- "dot-case": { +- "version": "3.0.4", +- "requires": { +- "no-case": "^3.0.4", +- "tslib": "^2.0.3" +- } +- }, +- "dot-prop": { +- "version": "6.0.1", +- "requires": { +- "is-obj": "^2.0.0" +- } +- }, +- "dotenv": { +- "version": "9.0.2", +- "dev": true +- }, +- "dotenv-expand": { +- "version": "5.1.0", +- "dev": true +- }, +- "dotgitignore": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "find-up": "^3.0.0", +- "minimatch": "^3.0.4" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "find-up": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "locate-path": "^3.0.0" +- } +- }, +- "locate-path": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "p-locate": "^3.0.0", +- "path-exists": "^3.0.0" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- }, +- "p-limit": { +- "version": "2.3.0", +- "dev": true, +- "requires": { +- "p-try": "^2.0.0" +- } +- }, +- "p-locate": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "p-limit": "^2.0.0" +- } +- }, +- "p-try": { +- "version": "2.2.0", +- "dev": true +- } +- } +- }, +- "eastasianwidth": { +- "version": "0.2.0", +- "dev": true +- }, +- "ee-first": { +- "version": "1.1.1", +- "dev": true +- }, +- "ejs": { +- "version": "3.1.10", +- "dev": true, +- "requires": { +- "jake": "^10.8.5" +- } +- }, +- "electron": { +- "version": "30.0.8", +- "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.8.tgz", +- "integrity": "sha512-ivzXJJ/9gdb4oOw+5SDuaZpSInz8C+Z021dKZfFLMltKbDa4sSqt5cRBiUg7J36Z2kdus+Jai0bdHWutYE9wAA==", +- "requires": { +- "@electron/get": "^2.0.0", +- "@types/node": "^20.9.0", +- "extract-zip": "^2.0.1" +- }, +- "dependencies": { +- "@types/node": { +- "version": "20.12.12", +- "requires": { +- "undici-types": "~5.26.4" +- } +- } +- } +- }, +- "electron-builder": { +- "version": "24.13.3", +- "dev": true, +- "requires": { +- "app-builder-lib": "24.13.3", +- "builder-util": "24.13.1", +- "builder-util-runtime": "9.2.4", +- "chalk": "^4.1.2", +- "dmg-builder": "24.13.3", +- "fs-extra": "^10.1.0", +- "is-ci": "^3.0.0", +- "lazy-val": "^1.0.5", +- "read-config-file": "6.3.2", +- "simple-update-notifier": "2.0.0", +- "yargs": "^17.6.2" +- }, +- "dependencies": { +- "cliui": { +- "version": "8.0.1", +- "dev": true, +- "requires": { +- "string-width": "^4.2.0", +- "strip-ansi": "^6.0.1", +- "wrap-ansi": "^7.0.0" +- } +- }, +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- }, +- "wrap-ansi": { +- "version": "7.0.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- } +- }, +- "y18n": { +- "version": "5.0.8", +- "dev": true +- }, +- "yargs": { +- "version": "17.7.2", +- "dev": true, +- "requires": { +- "cliui": "^8.0.1", +- "escalade": "^3.1.1", +- "get-caller-file": "^2.0.5", +- "require-directory": "^2.1.1", +- "string-width": "^4.2.3", +- "y18n": "^5.0.5", +- "yargs-parser": "^21.1.1" +- } +- }, +- "yargs-parser": { +- "version": "21.1.1", +- "dev": true +- } +- } +- }, +- "electron-builder-squirrel-windows": { +- "version": "24.13.3", +- "dev": true, +- "peer": true, +- "requires": { +- "app-builder-lib": "24.13.3", +- "archiver": "^5.3.1", +- "builder-util": "24.13.1", +- "fs-extra": "^10.1.0" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "peer": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "peer": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true, +- "peer": true +- } +- } +- }, +- "electron-log": { +- "version": "5.0.1" +- }, +- "electron-publish": { +- "version": "24.13.1", +- "dev": true, +- "requires": { +- "@types/fs-extra": "^9.0.11", +- "builder-util": "24.13.1", +- "builder-util-runtime": "9.2.4", +- "chalk": "^4.1.2", +- "fs-extra": "^10.1.0", +- "lazy-val": "^1.0.5", +- "mime": "^2.5.2" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "electron-store": { +- "version": "8.1.0", +- "requires": { +- "conf": "^10.2.0", +- "type-fest": "^2.17.0" +- } +- }, +- "electron-to-chromium": { +- "version": "1.4.594" +- }, +- "electron-updater": { +- "version": "4.6.5", +- "requires": { +- "@types/semver": "^7.3.6", +- "builder-util-runtime": "8.9.2", +- "fs-extra": "^10.0.0", +- "js-yaml": "^4.1.0", +- "lazy-val": "^1.0.5", +- "lodash.escaperegexp": "^4.1.2", +- "lodash.isequal": "^4.5.0", +- "semver": "^7.3.5" +- }, +- "dependencies": { +- "builder-util-runtime": { +- "version": "8.9.2", +- "requires": { +- "debug": "^4.3.2", +- "sax": "^1.2.4" +- } +- }, +- "fs-extra": { +- "version": "10.1.0", +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "lru-cache": { +- "version": "6.0.0", +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1" +- }, +- "yallist": { +- "version": "4.0.0" +- } +- } +- }, +- "electron-window-state": { +- "version": "5.0.3", +- "requires": { +- "jsonfile": "^4.0.0", +- "mkdirp": "^0.5.1" +- } +- }, +- "emoji-regex": { +- "version": "8.0.0", +- "dev": true +- }, +- "emojis-list": { +- "version": "3.0.0" +- }, +- "encodeurl": { +- "version": "1.0.2", +- "dev": true +- }, +- "encoding": { +- "version": "0.1.13", +- "requires": { +- "iconv-lite": "^0.6.2" +- } +- }, +- "end-of-stream": { +- "version": "1.4.4", +- "requires": { +- "once": "^1.4.0" +- } +- }, +- "enhanced-resolve": { +- "version": "5.16.1", +- "requires": { +- "graceful-fs": "^4.2.4", +- "tapable": "^2.2.0" +- } +- }, +- "enquirer": { +- "version": "2.4.1", +- "dev": true, +- "requires": { +- "ansi-colors": "^4.1.1", +- "strip-ansi": "^6.0.1" +- } +- }, +- "entities": { +- "version": "4.5.0" +- }, +- "env-paths": { +- "version": "2.2.1" +- }, +- "envinfo": { +- "version": "7.11.0" +- }, +- "err-code": { +- "version": "2.0.3", +- "dev": true +- }, +- "error-ex": { +- "version": "1.3.2", +- "dev": true, +- "requires": { +- "is-arrayish": "^0.2.1" +- } +- }, +- "es-abstract": { +- "version": "1.22.3", +- "dev": true, +- "requires": { +- "array-buffer-byte-length": "^1.0.0", +- "arraybuffer.prototype.slice": "^1.0.2", +- "available-typed-arrays": "^1.0.5", +- "call-bind": "^1.0.5", +- "es-set-tostringtag": "^2.0.1", +- "es-to-primitive": "^1.2.1", +- "function.prototype.name": "^1.1.6", +- "get-intrinsic": "^1.2.2", +- "get-symbol-description": "^1.0.0", +- "globalthis": "^1.0.3", +- "gopd": "^1.0.1", +- "has-property-descriptors": "^1.0.0", +- "has-proto": "^1.0.1", +- "has-symbols": "^1.0.3", +- "hasown": "^2.0.0", +- "internal-slot": "^1.0.5", +- "is-array-buffer": "^3.0.2", +- "is-callable": "^1.2.7", +- "is-negative-zero": "^2.0.2", +- "is-regex": "^1.1.4", +- "is-shared-array-buffer": "^1.0.2", +- "is-string": "^1.0.7", +- "is-typed-array": "^1.1.12", +- "is-weakref": "^1.0.2", +- "object-inspect": "^1.13.1", +- "object-keys": "^1.1.1", +- "object.assign": "^4.1.4", +- "regexp.prototype.flags": "^1.5.1", +- "safe-array-concat": "^1.0.1", +- "safe-regex-test": "^1.0.0", +- "string.prototype.trim": "^1.2.8", +- "string.prototype.trimend": "^1.0.7", +- "string.prototype.trimstart": "^1.0.7", +- "typed-array-buffer": "^1.0.0", +- "typed-array-byte-length": "^1.0.0", +- "typed-array-byte-offset": "^1.0.0", +- "typed-array-length": "^1.0.4", +- "unbox-primitive": "^1.0.2", +- "which-typed-array": "^1.1.13" +- } +- }, +- "es-module-lexer": { +- "version": "1.5.2" +- }, +- "es-set-tostringtag": { +- "version": "2.0.2", +- "dev": true, +- "requires": { +- "get-intrinsic": "^1.2.2", +- "has-tostringtag": "^1.0.0", +- "hasown": "^2.0.0" +- } +- }, +- "es-shim-unscopables": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "hasown": "^2.0.0" +- } +- }, +- "es-to-primitive": { +- "version": "1.2.1", +- "dev": true, +- "requires": { +- "is-callable": "^1.1.4", +- "is-date-object": "^1.0.1", +- "is-symbol": "^1.0.2" +- } +- }, +- "es6-error": { +- "version": "4.1.1", +- "optional": true +- }, +- "escalade": { +- "version": "3.1.1" +- }, +- "escape-html": { +- "version": "1.0.3", +- "dev": true +- }, +- "escape-string-regexp": { +- "version": "4.0.0", +- "devOptional": true +- }, +- "eslint": { +- "version": "7.32.0", +- "dev": true, +- "requires": { +- "@babel/code-frame": "7.12.11", +- "@eslint/eslintrc": "^0.4.3", +- "@humanwhocodes/config-array": "^0.5.0", +- "ajv": "^6.10.0", +- "chalk": "^4.0.0", +- "cross-spawn": "^7.0.2", +- "debug": "^4.0.1", +- "doctrine": "^3.0.0", +- "enquirer": "^2.3.5", +- "escape-string-regexp": "^4.0.0", +- "eslint-scope": "^5.1.1", +- "eslint-utils": "^2.1.0", +- "eslint-visitor-keys": "^2.0.0", +- "espree": "^7.3.1", +- "esquery": "^1.4.0", +- "esutils": "^2.0.2", +- "fast-deep-equal": "^3.1.3", +- "file-entry-cache": "^6.0.1", +- "functional-red-black-tree": "^1.0.1", +- "glob-parent": "^5.1.2", +- "globals": "^13.6.0", +- "ignore": "^4.0.6", +- "import-fresh": "^3.0.0", +- "imurmurhash": "^0.1.4", +- "is-glob": "^4.0.0", +- "js-yaml": "^3.13.1", +- "json-stable-stringify-without-jsonify": "^1.0.1", +- "levn": "^0.4.1", +- "lodash.merge": "^4.6.2", +- "minimatch": "^3.0.4", +- "natural-compare": "^1.4.0", +- "optionator": "^0.9.1", +- "progress": "^2.0.0", +- "regexpp": "^3.1.0", +- "semver": "^7.2.1", +- "strip-ansi": "^6.0.0", +- "strip-json-comments": "^3.1.0", +- "table": "^6.0.9", +- "text-table": "^0.2.0", +- "v8-compile-cache": "^2.0.3" +- }, +- "dependencies": { +- "@babel/code-frame": { +- "version": "7.12.11", +- "dev": true, +- "requires": { +- "@babel/highlight": "^7.10.4" +- } +- }, +- "argparse": { +- "version": "1.0.10", +- "dev": true, +- "requires": { +- "sprintf-js": "~1.0.2" +- } +- }, +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "eslint-utils": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "eslint-visitor-keys": "^1.1.0" +- }, +- "dependencies": { +- "eslint-visitor-keys": { +- "version": "1.3.0", +- "dev": true +- } +- } +- }, +- "globals": { +- "version": "13.23.0", +- "dev": true, +- "requires": { +- "type-fest": "^0.20.2" +- } +- }, +- "ignore": { +- "version": "4.0.6", +- "dev": true +- }, +- "js-yaml": { +- "version": "3.14.1", +- "dev": true, +- "requires": { +- "argparse": "^1.0.7", +- "esprima": "^4.0.0" +- } +- }, +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "sprintf-js": { +- "version": "1.0.3", +- "dev": true +- }, +- "type-fest": { +- "version": "0.20.2", +- "dev": true +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "eslint-config-standard": { +- "version": "16.0.3", +- "dev": true, +- "requires": {} +- }, +- "eslint-import-resolver-node": { +- "version": "0.3.9", +- "dev": true, +- "requires": { +- "debug": "^3.2.7", +- "is-core-module": "^2.13.0", +- "resolve": "^1.22.4" +- }, +- "dependencies": { +- "debug": { +- "version": "3.2.7", +- "dev": true, +- "requires": { +- "ms": "^2.1.1" +- } +- } +- } +- }, +- "eslint-module-utils": { +- "version": "2.8.0", +- "dev": true, +- "requires": { +- "debug": "^3.2.7" +- }, +- "dependencies": { +- "debug": { +- "version": "3.2.7", +- "dev": true, +- "requires": { +- "ms": "^2.1.1" +- } +- } +- } +- }, +- "eslint-plugin-es": { +- "version": "3.0.1", +- "dev": true, +- "requires": { +- "eslint-utils": "^2.0.0", +- "regexpp": "^3.0.0" +- }, +- "dependencies": { +- "eslint-utils": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "eslint-visitor-keys": "^1.1.0" +- } +- }, +- "eslint-visitor-keys": { +- "version": "1.3.0", +- "dev": true +- } +- } +- }, +- "eslint-plugin-import": { +- "version": "2.24.2", +- "dev": true, +- "requires": { +- "array-includes": "^3.1.3", +- "array.prototype.flat": "^1.2.4", +- "debug": "^2.6.9", +- "doctrine": "^2.1.0", +- "eslint-import-resolver-node": "^0.3.6", +- "eslint-module-utils": "^2.6.2", +- "find-up": "^2.0.0", +- "has": "^1.0.3", +- "is-core-module": "^2.6.0", +- "minimatch": "^3.0.4", +- "object.values": "^1.1.4", +- "pkg-up": "^2.0.0", +- "read-pkg-up": "^3.0.0", +- "resolve": "^1.20.0", +- "tsconfig-paths": "^3.11.0" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "doctrine": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "esutils": "^2.0.2" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- }, +- "pkg-up": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "find-up": "^2.1.0" +- } +- } +- } +- }, +- "eslint-plugin-node": { +- "version": "11.1.0", +- "dev": true, +- "requires": { +- "eslint-plugin-es": "^3.0.0", +- "eslint-utils": "^2.0.0", +- "ignore": "^5.1.1", +- "minimatch": "^3.0.4", +- "resolve": "^1.10.1", +- "semver": "^6.1.0" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "eslint-utils": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "eslint-visitor-keys": "^1.1.0" +- } +- }, +- "eslint-visitor-keys": { +- "version": "1.3.0", +- "dev": true +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- } +- } +- }, +- "eslint-plugin-promise": { +- "version": "5.2.0", +- "dev": true, +- "requires": {} +- }, +- "eslint-plugin-simple-import-sort": { +- "version": "10.0.0", +- "dev": true, +- "requires": {} +- }, +- "eslint-plugin-vue": { +- "version": "8.0.3", +- "dev": true, +- "requires": { +- "eslint-utils": "^3.0.0", +- "natural-compare": "^1.4.0", +- "semver": "^7.3.5", +- "vue-eslint-parser": "^8.0.1" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "eslint-scope": { +- "version": "5.1.1", +- "requires": { +- "esrecurse": "^4.3.0", +- "estraverse": "^4.1.1" +- } +- }, +- "eslint-utils": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "eslint-visitor-keys": "^2.0.0" +- } +- }, +- "eslint-visitor-keys": { +- "version": "2.1.0", +- "dev": true +- }, +- "espree": { +- "version": "7.3.1", +- "dev": true, +- "requires": { +- "acorn": "^7.4.0", +- "acorn-jsx": "^5.3.1", +- "eslint-visitor-keys": "^1.3.0" +- }, +- "dependencies": { +- "eslint-visitor-keys": { +- "version": "1.3.0", +- "dev": true +- } +- } +- }, +- "esprima": { +- "version": "4.0.1", +- "dev": true +- }, +- "esquery": { +- "version": "1.5.0", +- "dev": true, +- "requires": { +- "estraverse": "^5.1.0" +- }, +- "dependencies": { +- "estraverse": { +- "version": "5.3.0", +- "dev": true +- } +- } +- }, +- "esrecurse": { +- "version": "4.3.0", +- "requires": { +- "estraverse": "^5.2.0" +- }, +- "dependencies": { +- "estraverse": { +- "version": "5.3.0" +- } +- } +- }, +- "estraverse": { +- "version": "4.3.0" +- }, +- "estree-walker": { +- "version": "2.0.2" +- }, +- "esutils": { +- "version": "2.0.3", +- "dev": true +- }, +- "etag": { +- "version": "1.8.1", +- "dev": true +- }, +- "eventemitter3": { +- "version": "4.0.7", +- "dev": true +- }, +- "events": { +- "version": "3.3.0" +- }, +- "execa": { +- "version": "5.1.1", +- "requires": { +- "cross-spawn": "^7.0.3", +- "get-stream": "^6.0.0", +- "human-signals": "^2.1.0", +- "is-stream": "^2.0.0", +- "merge-stream": "^2.0.0", +- "npm-run-path": "^4.0.1", +- "onetime": "^5.1.2", +- "signal-exit": "^3.0.3", +- "strip-final-newline": "^2.0.0" +- }, +- "dependencies": { +- "get-stream": { +- "version": "6.0.1" +- } +- } +- }, +- "expand-template": { +- "version": "2.0.3" +- }, +- "express": { +- "version": "4.19.2", +- "dev": true, +- "requires": { +- "accepts": "~1.3.8", +- "array-flatten": "1.1.1", +- "body-parser": "1.20.2", +- "content-disposition": "0.5.4", +- "content-type": "~1.0.4", +- "cookie": "0.6.0", +- "cookie-signature": "1.0.6", +- "debug": "2.6.9", +- "depd": "2.0.0", +- "encodeurl": "~1.0.2", +- "escape-html": "~1.0.3", +- "etag": "~1.8.1", +- "finalhandler": "1.2.0", +- "fresh": "0.5.2", +- "http-errors": "2.0.0", +- "merge-descriptors": "1.0.1", +- "methods": "~1.1.2", +- "on-finished": "2.4.1", +- "parseurl": "~1.3.3", +- "path-to-regexp": "0.1.7", +- "proxy-addr": "~2.0.7", +- "qs": "6.11.0", +- "range-parser": "~1.2.1", +- "safe-buffer": "5.2.1", +- "send": "0.18.0", +- "serve-static": "1.15.0", +- "setprototypeof": "1.2.0", +- "statuses": "2.0.1", +- "type-is": "~1.6.18", +- "utils-merge": "1.0.1", +- "vary": "~1.1.2" +- }, +- "dependencies": { +- "array-flatten": { +- "version": "1.1.1", +- "dev": true +- }, +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- } +- } +- }, +- "external-editor": { +- "version": "3.1.0", +- "dev": true, +- "requires": { +- "chardet": "^0.7.0", +- "iconv-lite": "^0.4.24", +- "tmp": "^0.0.33" +- }, +- "dependencies": { +- "iconv-lite": { +- "version": "0.4.24", +- "dev": true, +- "requires": { +- "safer-buffer": ">= 2.1.2 < 3" +- } +- } +- } +- }, +- "extract-zip": { +- "version": "2.0.1", +- "requires": { +- "@types/yauzl": "^2.9.1", +- "debug": "^4.1.1", +- "get-stream": "^5.1.0", +- "yauzl": "^2.10.0" +- } +- }, +- "fast-deep-equal": { +- "version": "3.1.3" +- }, +- "fast-glob": { +- "version": "3.3.2", +- "dev": true, +- "requires": { +- "@nodelib/fs.stat": "^2.0.2", +- "@nodelib/fs.walk": "^1.2.3", +- "glob-parent": "^5.1.2", +- "merge2": "^1.3.0", +- "micromatch": "^4.0.4" +- } +- }, +- "fast-json-stable-stringify": { +- "version": "2.1.0" +- }, +- "fast-levenshtein": { +- "version": "2.0.6", +- "dev": true +- }, +- "fastest-levenshtein": { +- "version": "1.0.16" +- }, +- "fastq": { +- "version": "1.15.0", +- "dev": true, +- "requires": { +- "reusify": "^1.0.4" +- } +- }, +- "faye-websocket": { +- "version": "0.11.4", +- "dev": true, +- "requires": { +- "websocket-driver": ">=0.5.1" +- } +- }, +- "fd-slicer": { +- "version": "1.1.0", +- "requires": { +- "pend": "~1.2.0" +- } +- }, +- "figures": { +- "version": "3.2.0", +- "dev": true, +- "requires": { +- "escape-string-regexp": "^1.0.5" +- }, +- "dependencies": { +- "escape-string-regexp": { +- "version": "1.0.5", +- "dev": true +- } +- } +- }, +- "file-entry-cache": { +- "version": "6.0.1", +- "dev": true, +- "requires": { +- "flat-cache": "^3.0.4" +- } +- }, +- "file-loader": { +- "version": "6.2.0", +- "requires": { +- "loader-utils": "^2.0.0", +- "schema-utils": "^3.0.0" +- }, +- "dependencies": { +- "schema-utils": { +- "version": "3.3.0", +- "requires": { +- "@types/json-schema": "^7.0.8", +- "ajv": "^6.12.5", +- "ajv-keywords": "^3.5.2" +- } +- } +- } +- }, +- "file-uri-to-path": { +- "version": "1.0.0" +- }, +- "filelist": { +- "version": "1.0.4", +- "dev": true, +- "requires": { +- "minimatch": "^5.0.1" +- } +- }, +- "fill-range": { +- "version": "7.0.1", +- "requires": { +- "to-regex-range": "^5.0.1" +- } +- }, +- "finalhandler": { +- "version": "1.2.0", +- "dev": true, +- "requires": { +- "debug": "2.6.9", +- "encodeurl": "~1.0.2", +- "escape-html": "~1.0.3", +- "on-finished": "2.4.1", +- "parseurl": "~1.3.3", +- "statuses": "2.0.1", +- "unpipe": "~1.0.0" +- }, +- "dependencies": { +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- } +- } +- }, +- "find-cache-dir": { +- "version": "3.3.2", +- "requires": { +- "commondir": "^1.0.1", +- "make-dir": "^3.0.2", +- "pkg-dir": "^4.1.0" +- } +- }, +- "find-up": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "locate-path": "^2.0.0" +- } +- }, +- "flat": { +- "version": "5.0.2" +- }, +- "flat-cache": { +- "version": "3.2.0", +- "dev": true, +- "requires": { +- "flatted": "^3.2.9", +- "keyv": "^4.5.3", +- "rimraf": "^3.0.2" +- } +- }, +- "flatted": { +- "version": "3.2.9", +- "dev": true +- }, +- "floating-vue": { +- "version": "2.0.0-beta.24", +- "requires": { +- "@floating-ui/dom": "~1.1.1", +- "vue-resize": "^2.0.0-alpha.1" +- } +- }, +- "follow-redirects": { +- "version": "1.15.6", +- "dev": true +- }, +- "for-each": { +- "version": "0.3.3", +- "dev": true, +- "requires": { +- "is-callable": "^1.1.3" +- } +- }, +- "foreground-child": { +- "version": "3.1.1", +- "dev": true, +- "requires": { +- "cross-spawn": "^7.0.0", +- "signal-exit": "^4.0.1" +- }, +- "dependencies": { +- "signal-exit": { +- "version": "4.1.0", +- "dev": true +- } +- } +- }, +- "form-data": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "asynckit": "^0.4.0", +- "combined-stream": "^1.0.8", +- "mime-types": "^2.1.12" +- } +- }, +- "forwarded": { +- "version": "0.2.0", +- "dev": true +- }, +- "fresh": { +- "version": "0.5.2", +- "dev": true +- }, +- "fs-access": { +- "version": "1.0.1", +- "dev": true, +- "requires": { +- "null-check": "^1.0.0" +- } +- }, +- "fs-constants": { +- "version": "1.0.0" +- }, +- "fs-extra": { +- "version": "8.1.0", +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^4.0.0", +- "universalify": "^0.1.0" +- } +- }, +- "fs-minipass": { +- "version": "2.1.0", +- "dev": true, +- "requires": { +- "minipass": "^3.0.0" +- }, +- "dependencies": { +- "minipass": { +- "version": "3.3.6", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "fs-monkey": { +- "version": "1.0.5", +- "dev": true +- }, +- "fs.realpath": { +- "version": "1.0.0" +- }, +- "function-bind": { +- "version": "1.1.2" +- }, +- "function.prototype.name": { +- "version": "1.1.6", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1", +- "functions-have-names": "^1.2.3" +- } +- }, +- "functional-red-black-tree": { +- "version": "1.0.1", +- "dev": true +- }, +- "functions-have-names": { +- "version": "1.2.3", +- "dev": true +- }, +- "generate-function": { +- "version": "2.3.1", +- "requires": { +- "is-property": "^1.0.2" +- } +- }, +- "gensync": { +- "version": "1.0.0-beta.2", +- "peer": true +- }, +- "get-caller-file": { +- "version": "2.0.5", +- "dev": true +- }, +- "get-intrinsic": { +- "version": "1.2.2", +- "devOptional": true, +- "requires": { +- "function-bind": "^1.1.2", +- "has-proto": "^1.0.1", +- "has-symbols": "^1.0.3", +- "hasown": "^2.0.0" +- } +- }, +- "get-pkg-repo": { +- "version": "4.2.1", +- "dev": true, +- "requires": { +- "@hutson/parse-repository-url": "^3.0.0", +- "hosted-git-info": "^4.0.0", +- "through2": "^2.0.0", +- "yargs": "^16.2.0" +- }, +- "dependencies": { +- "cliui": { +- "version": "7.0.4", +- "dev": true, +- "requires": { +- "string-width": "^4.2.0", +- "strip-ansi": "^6.0.0", +- "wrap-ansi": "^7.0.0" +- } +- }, +- "isarray": { +- "version": "1.0.0", +- "dev": true +- }, +- "readable-stream": { +- "version": "2.3.8", +- "dev": true, +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "dev": true +- }, +- "string_decoder": { +- "version": "1.1.1", +- "dev": true, +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- }, +- "through2": { +- "version": "2.0.5", +- "dev": true, +- "requires": { +- "readable-stream": "~2.3.6", +- "xtend": "~4.0.1" +- } +- }, +- "wrap-ansi": { +- "version": "7.0.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- } +- }, +- "y18n": { +- "version": "5.0.8", +- "dev": true +- }, +- "yargs": { +- "version": "16.2.0", +- "dev": true, +- "requires": { +- "cliui": "^7.0.2", +- "escalade": "^3.1.1", +- "get-caller-file": "^2.0.5", +- "require-directory": "^2.1.1", +- "string-width": "^4.2.0", +- "y18n": "^5.0.5", +- "yargs-parser": "^20.2.2" +- } +- } +- } +- }, +- "get-stdin": { +- "version": "8.0.0" +- }, +- "get-stream": { +- "version": "5.2.0", +- "requires": { +- "pump": "^3.0.0" +- } +- }, +- "get-symbol-description": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "get-intrinsic": "^1.1.1" +- } +- }, +- "git-raw-commits": { +- "version": "2.0.11", +- "dev": true, +- "requires": { +- "dargs": "^7.0.0", +- "lodash": "^4.17.15", +- "meow": "^8.0.0", +- "split2": "^3.0.0", +- "through2": "^4.0.0" +- }, +- "dependencies": { +- "split2": { +- "version": "3.2.2", +- "dev": true, +- "requires": { +- "readable-stream": "^3.0.0" +- } +- } +- } +- }, +- "git-remote-origin-url": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "gitconfiglocal": "^1.0.0", +- "pify": "^2.3.0" +- }, +- "dependencies": { +- "pify": { +- "version": "2.3.0", +- "dev": true +- } +- } +- }, +- "git-semver-tags": { +- "version": "4.1.1", +- "dev": true, +- "requires": { +- "meow": "^8.0.0", +- "semver": "^6.0.0" +- } +- }, +- "gitconfiglocal": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "ini": "^1.3.2" +- } +- }, +- "github-from-package": { +- "version": "0.0.0" +- }, +- "glob": { +- "version": "7.2.3", +- "requires": { +- "fs.realpath": "^1.0.0", +- "inflight": "^1.0.4", +- "inherits": "2", +- "minimatch": "^3.1.1", +- "once": "^1.3.0", +- "path-is-absolute": "^1.0.0" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- } +- } +- }, +- "glob-parent": { +- "version": "5.1.2", +- "requires": { +- "is-glob": "^4.0.1" +- } +- }, +- "glob-to-regexp": { +- "version": "0.4.1" +- }, +- "global-agent": { +- "version": "3.0.0", +- "optional": true, +- "requires": { +- "boolean": "^3.0.1", +- "es6-error": "^4.1.1", +- "matcher": "^3.0.0", +- "roarr": "^2.15.3", +- "semver": "^7.3.2", +- "serialize-error": "^7.0.1" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "optional": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "optional": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "optional": true +- } +- } +- }, +- "global-directory": { +- "version": "4.0.1", +- "dev": true, +- "requires": { +- "ini": "4.1.1" +- }, +- "dependencies": { +- "ini": { +- "version": "4.1.1", +- "dev": true +- } +- } +- }, +- "global-modules": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "global-prefix": "^3.0.0" +- } +- }, +- "global-prefix": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "ini": "^1.3.5", +- "kind-of": "^6.0.2", +- "which": "^1.3.1" +- }, +- "dependencies": { +- "which": { +- "version": "1.3.1", +- "dev": true, +- "requires": { +- "isexe": "^2.0.0" +- } +- } +- } +- }, +- "globals": { +- "version": "11.12.0" +- }, +- "globalthis": { +- "version": "1.0.3", +- "devOptional": true, +- "requires": { +- "define-properties": "^1.1.3" +- } +- }, +- "globby": { +- "version": "11.1.0", +- "dev": true, +- "requires": { +- "array-union": "^2.1.0", +- "dir-glob": "^3.0.1", +- "fast-glob": "^3.2.9", +- "ignore": "^5.2.0", +- "merge2": "^1.4.1", +- "slash": "^3.0.0" +- } +- }, +- "globjoin": { +- "version": "0.1.4", +- "dev": true +- }, +- "gopd": { +- "version": "1.0.1", +- "devOptional": true, +- "requires": { +- "get-intrinsic": "^1.1.3" +- } +- }, +- "got": { +- "version": "11.8.6", +- "requires": { +- "@sindresorhus/is": "^4.0.0", +- "@szmarczak/http-timer": "^4.0.5", +- "@types/cacheable-request": "^6.0.1", +- "@types/responselike": "^1.0.0", +- "cacheable-lookup": "^5.0.3", +- "cacheable-request": "^7.0.2", +- "decompress-response": "^6.0.0", +- "http2-wrapper": "^1.0.0-beta.5.2", +- "lowercase-keys": "^2.0.0", +- "p-cancelable": "^2.0.0", +- "responselike": "^2.0.0" +- } +- }, +- "graceful-fs": { +- "version": "4.2.11" +- }, +- "handle-thing": { +- "version": "2.0.1", +- "dev": true +- }, +- "handlebars": { +- "version": "4.7.8", +- "dev": true, +- "requires": { +- "minimist": "^1.2.5", +- "neo-async": "^2.6.2", +- "source-map": "^0.6.1", +- "uglify-js": "^3.1.4", +- "wordwrap": "^1.0.0" +- } +- }, +- "hard-rejection": { +- "version": "2.1.0", +- "dev": true +- }, +- "has": { +- "version": "1.0.4", +- "dev": true +- }, +- "has-bigints": { +- "version": "1.0.2", +- "dev": true +- }, +- "has-flag": { +- "version": "4.0.0" +- }, +- "has-property-descriptors": { +- "version": "1.0.1", +- "devOptional": true, +- "requires": { +- "get-intrinsic": "^1.2.2" +- } +- }, +- "has-proto": { +- "version": "1.0.1", +- "devOptional": true +- }, +- "has-symbols": { +- "version": "1.0.3", +- "devOptional": true +- }, +- "has-tostringtag": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "has-symbols": "^1.0.2" +- } +- }, +- "hash-sum": { +- "version": "2.0.0" +- }, +- "hasown": { +- "version": "2.0.0", +- "requires": { +- "function-bind": "^1.1.2" +- } +- }, +- "he": { +- "version": "1.2.0" +- }, +- "hosted-git-info": { +- "version": "4.1.0", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "hpack.js": { +- "version": "2.1.6", +- "dev": true, +- "requires": { +- "inherits": "^2.0.1", +- "obuf": "^1.0.0", +- "readable-stream": "^2.0.1", +- "wbuf": "^1.1.0" +- }, +- "dependencies": { +- "isarray": { +- "version": "1.0.0", +- "dev": true +- }, +- "readable-stream": { +- "version": "2.3.8", +- "dev": true, +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "dev": true +- }, +- "string_decoder": { +- "version": "1.1.1", +- "dev": true, +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- } +- } +- }, +- "html-entities": { +- "version": "2.4.0", +- "dev": true +- }, +- "html-minifier-terser": { +- "version": "6.1.0", +- "requires": { +- "camel-case": "^4.1.2", +- "clean-css": "^5.2.2", +- "commander": "^8.3.0", +- "he": "^1.2.0", +- "param-case": "^3.0.4", +- "relateurl": "^0.2.7", +- "terser": "^5.10.0" +- }, +- "dependencies": { +- "commander": { +- "version": "8.3.0" +- } +- } +- }, +- "html-tags": { +- "version": "3.3.1", +- "dev": true +- }, +- "html-webpack-plugin": { +- "version": "5.5.3", +- "requires": { +- "@types/html-minifier-terser": "^6.0.0", +- "html-minifier-terser": "^6.0.2", +- "lodash": "^4.17.21", +- "pretty-error": "^4.0.0", +- "tapable": "^2.0.0" +- } +- }, +- "htmlparser2": { +- "version": "8.0.2", +- "requires": { +- "domelementtype": "^2.3.0", +- "domhandler": "^5.0.3", +- "domutils": "^3.0.1", +- "entities": "^4.4.0" +- } +- }, +- "http-cache-semantics": { +- "version": "4.1.1" +- }, +- "http-deceiver": { +- "version": "1.2.7", +- "dev": true +- }, +- "http-errors": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "depd": "2.0.0", +- "inherits": "2.0.4", +- "setprototypeof": "1.2.0", +- "statuses": "2.0.1", +- "toidentifier": "1.0.1" +- } +- }, +- "http-parser-js": { +- "version": "0.5.8", +- "dev": true +- }, +- "http-proxy": { +- "version": "1.18.1", +- "dev": true, +- "requires": { +- "eventemitter3": "^4.0.0", +- "follow-redirects": "^1.0.0", +- "requires-port": "^1.0.0" +- } +- }, +- "http-proxy-agent": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "@tootallnate/once": "2", +- "agent-base": "6", +- "debug": "4" +- } +- }, +- "http-proxy-middleware": { +- "version": "2.0.6", +- "dev": true, +- "requires": { +- "@types/http-proxy": "^1.17.8", +- "http-proxy": "^1.18.1", +- "is-glob": "^4.0.1", +- "is-plain-obj": "^3.0.0", +- "micromatch": "^4.0.2" +- }, +- "dependencies": { +- "is-plain-obj": { +- "version": "3.0.0", +- "dev": true +- } +- } +- }, +- "http2-wrapper": { +- "version": "1.0.3", +- "requires": { +- "quick-lru": "^5.1.1", +- "resolve-alpn": "^1.0.0" +- } +- }, +- "https-proxy-agent": { +- "version": "5.0.1", +- "dev": true, +- "requires": { +- "agent-base": "6", +- "debug": "4" +- } +- }, +- "human-signals": { +- "version": "2.1.0" +- }, +- "husky": { +- "version": "9.0.11", +- "dev": true +- }, +- "iconv-lite": { +- "version": "0.6.3", +- "requires": { +- "safer-buffer": ">= 2.1.2 < 3.0.0" +- } +- }, +- "icss-utils": { +- "version": "5.1.0", +- "requires": {} +- }, +- "ieee754": { +- "version": "1.2.1" +- }, +- "ignore": { +- "version": "5.3.0", +- "dev": true +- }, +- "immediate": { +- "version": "3.0.6" +- }, +- "import-fresh": { +- "version": "3.3.0", +- "dev": true, +- "requires": { +- "parent-module": "^1.0.0", +- "resolve-from": "^4.0.0" +- } +- }, +- "import-lazy": { +- "version": "4.0.0", +- "dev": true +- }, +- "import-local": { +- "version": "3.1.0", +- "requires": { +- "pkg-dir": "^4.2.0", +- "resolve-cwd": "^3.0.0" +- } +- }, +- "import-meta-resolve": { +- "version": "4.0.0", +- "dev": true +- }, +- "imurmurhash": { +- "version": "0.1.4", +- "dev": true +- }, +- "indent-string": { +- "version": "4.0.0", +- "dev": true +- }, +- "inflight": { +- "version": "1.0.6", +- "requires": { +- "once": "^1.3.0", +- "wrappy": "1" +- } +- }, +- "inherits": { +- "version": "2.0.4" +- }, +- "ini": { +- "version": "1.3.8" +- }, +- "inquirer": { +- "version": "7.3.3", +- "dev": true, +- "requires": { +- "ansi-escapes": "^4.2.1", +- "chalk": "^4.1.0", +- "cli-cursor": "^3.1.0", +- "cli-width": "^3.0.0", +- "external-editor": "^3.0.3", +- "figures": "^3.0.0", +- "lodash": "^4.17.19", +- "mute-stream": "0.0.8", +- "run-async": "^2.4.0", +- "rxjs": "^6.6.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0", +- "through": "^2.3.6" +- } +- }, +- "internal-slot": { +- "version": "1.0.6", +- "dev": true, +- "requires": { +- "get-intrinsic": "^1.2.2", +- "hasown": "^2.0.0", +- "side-channel": "^1.0.4" +- } +- }, +- "interpret": { +- "version": "2.2.0" +- }, +- "ip-address": { +- "version": "5.9.4", +- "requires": { +- "jsbn": "1.1.0", +- "lodash": "^4.17.15", +- "sprintf-js": "1.1.2" +- } +- }, +- "ipaddr.js": { +- "version": "2.1.0", +- "dev": true +- }, +- "is-array-buffer": { +- "version": "3.0.2", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "get-intrinsic": "^1.2.0", +- "is-typed-array": "^1.1.10" +- } +- }, +- "is-arrayish": { +- "version": "0.2.1", +- "dev": true +- }, +- "is-bigint": { +- "version": "1.0.4", +- "dev": true, +- "requires": { +- "has-bigints": "^1.0.1" +- } +- }, +- "is-binary-path": { +- "version": "2.1.0", +- "requires": { +- "binary-extensions": "^2.0.0" +- } +- }, +- "is-boolean-object": { +- "version": "1.1.2", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "has-tostringtag": "^1.0.0" +- } +- }, +- "is-callable": { +- "version": "1.2.7", +- "dev": true +- }, +- "is-ci": { +- "version": "3.0.1", +- "dev": true, +- "requires": { +- "ci-info": "^3.2.0" +- } +- }, +- "is-core-module": { +- "version": "2.13.1", +- "requires": { +- "hasown": "^2.0.0" +- } +- }, +- "is-date-object": { +- "version": "1.0.5", +- "dev": true, +- "requires": { +- "has-tostringtag": "^1.0.0" +- } +- }, +- "is-docker": { +- "version": "2.2.1", +- "dev": true +- }, +- "is-extglob": { +- "version": "2.1.1" +- }, +- "is-fullwidth-code-point": { +- "version": "3.0.0", +- "dev": true +- }, +- "is-glob": { +- "version": "4.0.3", +- "requires": { +- "is-extglob": "^2.1.1" +- } +- }, +- "is-negative-zero": { +- "version": "2.0.2", +- "dev": true +- }, +- "is-number": { +- "version": "7.0.0" +- }, +- "is-number-object": { +- "version": "1.0.7", +- "dev": true, +- "requires": { +- "has-tostringtag": "^1.0.0" +- } +- }, +- "is-obj": { +- "version": "2.0.0" +- }, +- "is-plain-obj": { +- "version": "1.1.0", +- "dev": true +- }, +- "is-plain-object": { +- "version": "5.0.0", +- "dev": true +- }, +- "is-property": { +- "version": "1.0.2" +- }, +- "is-regex": { +- "version": "1.1.4", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "has-tostringtag": "^1.0.0" +- } +- }, +- "is-shared-array-buffer": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2" +- } +- }, +- "is-stream": { +- "version": "2.0.1" +- }, +- "is-string": { +- "version": "1.0.7", +- "dev": true, +- "requires": { +- "has-tostringtag": "^1.0.0" +- } +- }, +- "is-symbol": { +- "version": "1.0.4", +- "dev": true, +- "requires": { +- "has-symbols": "^1.0.2" +- } +- }, +- "is-text-path": { +- "version": "1.0.1", +- "dev": true, +- "requires": { +- "text-extensions": "^1.0.0" +- } +- }, +- "is-typed-array": { +- "version": "1.1.12", +- "dev": true, +- "requires": { +- "which-typed-array": "^1.1.11" +- } +- }, +- "is-weakref": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2" +- } +- }, +- "is-wsl": { +- "version": "2.2.0", +- "dev": true, +- "requires": { +- "is-docker": "^2.0.0" +- } +- }, +- "isarray": { +- "version": "2.0.5", +- "dev": true +- }, +- "isbinaryfile": { +- "version": "5.0.2", +- "dev": true +- }, +- "isexe": { +- "version": "2.0.0" +- }, +- "isobject": { +- "version": "3.0.1" +- }, +- "jackspeak": { +- "version": "2.3.6", +- "dev": true, +- "requires": { +- "@isaacs/cliui": "^8.0.2", +- "@pkgjs/parseargs": "^0.11.0" +- } +- }, +- "jake": { +- "version": "10.9.1", +- "dev": true, +- "requires": { +- "async": "^3.2.3", +- "chalk": "^4.0.2", +- "filelist": "^1.0.4", +- "minimatch": "^3.1.2" +- }, +- "dependencies": { +- "brace-expansion": { +- "version": "1.1.11", +- "dev": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "minimatch": { +- "version": "3.1.2", +- "dev": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- } +- } +- }, +- "jest-worker": { +- "version": "27.5.1", +- "requires": { +- "@types/node": "*", +- "merge-stream": "^2.0.0", +- "supports-color": "^8.0.0" +- }, +- "dependencies": { +- "supports-color": { +- "version": "8.1.1", +- "requires": { +- "has-flag": "^4.0.0" +- } +- } +- } +- }, +- "jiti": { +- "version": "1.21.0", +- "dev": true +- }, +- "js-tokens": { +- "version": "4.0.0" +- }, +- "js-yaml": { +- "version": "4.1.0", +- "requires": { +- "argparse": "^2.0.1" +- } +- }, +- "jsbn": { +- "version": "1.1.0" +- }, +- "jsesc": { +- "version": "2.5.2" +- }, +- "json-buffer": { +- "version": "3.0.1" +- }, +- "json-fixer": { +- "version": "1.6.15", +- "dev": true, +- "requires": { +- "@babel/runtime": "^7.18.9", +- "chalk": "^4.1.2", +- "pegjs": "^0.10.0" +- } +- }, +- "json-parse-better-errors": { +- "version": "1.0.2", +- "dev": true +- }, +- "json-parse-even-better-errors": { +- "version": "2.3.1" +- }, +- "json-schema-traverse": { +- "version": "0.4.1" +- }, +- "json-schema-typed": { +- "version": "7.0.3" +- }, +- "json-stable-stringify-without-jsonify": { +- "version": "1.0.1", +- "dev": true +- }, +- "json-stringify-safe": { +- "version": "5.0.1", +- "devOptional": true +- }, +- "json2php": { +- "version": "0.0.7" +- }, +- "json5": { +- "version": "2.2.3" +- }, +- "jsonfile": { +- "version": "4.0.0", +- "requires": { +- "graceful-fs": "^4.1.6" +- } +- }, +- "jsonparse": { +- "version": "1.3.1", +- "dev": true +- }, +- "JSONStream": { +- "version": "1.3.5", +- "dev": true, +- "requires": { +- "jsonparse": "^1.2.0", +- "through": ">=2.2.7 <3" +- } +- }, +- "jszip": { +- "version": "3.10.1", +- "requires": { +- "lie": "~3.3.0", +- "pako": "~1.0.2", +- "readable-stream": "~2.3.6", +- "setimmediate": "^1.0.5" +- }, +- "dependencies": { +- "isarray": { +- "version": "1.0.0" +- }, +- "readable-stream": { +- "version": "2.3.8", +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "safe-buffer": { +- "version": "5.1.2" +- }, +- "string_decoder": { +- "version": "1.1.1", +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- } +- } +- }, +- "keyv": { +- "version": "4.5.4", +- "requires": { +- "json-buffer": "3.0.1" +- } +- }, +- "kind-of": { +- "version": "6.0.3" +- }, +- "klona": { +- "version": "2.0.6" +- }, +- "known-css-properties": { +- "version": "0.29.0", +- "dev": true +- }, +- "lazy-val": { +- "version": "1.0.5" +- }, +- "lazystream": { +- "version": "1.0.1", +- "dev": true, +- "peer": true, +- "requires": { +- "readable-stream": "^2.0.5" +- }, +- "dependencies": { +- "isarray": { +- "version": "1.0.0", +- "dev": true, +- "peer": true +- }, +- "readable-stream": { +- "version": "2.3.8", +- "dev": true, +- "peer": true, +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "dev": true, +- "peer": true +- }, +- "string_decoder": { +- "version": "1.1.1", +- "dev": true, +- "peer": true, +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- } +- } +- }, +- "leaflet": { +- "version": "1.7.1" +- }, +- "levn": { +- "version": "0.4.1", +- "dev": true, +- "requires": { +- "prelude-ls": "^1.2.1", +- "type-check": "~0.4.0" +- } +- }, +- "lie": { +- "version": "3.3.0", +- "requires": { +- "immediate": "~3.0.5" +- } +- }, +- "lines-and-columns": { +- "version": "1.2.4", +- "dev": true +- }, +- "load-json-file": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.2", +- "parse-json": "^4.0.0", +- "pify": "^3.0.0", +- "strip-bom": "^3.0.0" +- }, +- "dependencies": { +- "pify": { +- "version": "3.0.0", +- "dev": true +- } +- } +- }, +- "loader-runner": { +- "version": "4.3.0" +- }, +- "loader-utils": { +- "version": "2.0.4", +- "requires": { +- "big.js": "^5.2.2", +- "emojis-list": "^3.0.0", +- "json5": "^2.1.2" +- } +- }, +- "locate-path": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "p-locate": "^2.0.0", +- "path-exists": "^3.0.0" +- } +- }, +- "lodash": { +- "version": "4.17.21" +- }, +- "lodash.camelcase": { +- "version": "4.3.0", +- "dev": true +- }, +- "lodash.debounce": { +- "version": "4.0.8", +- "dev": true +- }, +- "lodash.defaults": { +- "version": "4.2.0", +- "dev": true, +- "peer": true +- }, +- "lodash.difference": { +- "version": "4.5.0", +- "dev": true, +- "peer": true +- }, +- "lodash.escaperegexp": { +- "version": "4.1.2" +- }, +- "lodash.flatten": { +- "version": "4.4.0", +- "dev": true, +- "peer": true +- }, +- "lodash.isequal": { +- "version": "4.5.0" +- }, +- "lodash.ismatch": { +- "version": "4.4.0", +- "dev": true +- }, +- "lodash.isplainobject": { +- "version": "4.0.6", +- "dev": true +- }, +- "lodash.kebabcase": { +- "version": "4.1.1", +- "dev": true +- }, +- "lodash.merge": { +- "version": "4.6.2", +- "dev": true +- }, +- "lodash.mergewith": { +- "version": "4.6.2", +- "dev": true +- }, +- "lodash.snakecase": { +- "version": "4.1.1", +- "dev": true +- }, +- "lodash.startcase": { +- "version": "4.4.0", +- "dev": true +- }, +- "lodash.truncate": { +- "version": "4.4.2", +- "dev": true +- }, +- "lodash.union": { +- "version": "4.6.0", +- "dev": true, +- "peer": true +- }, +- "lodash.uniq": { +- "version": "4.5.0", +- "dev": true +- }, +- "lodash.upperfirst": { +- "version": "4.3.1", +- "dev": true +- }, +- "log-update": { +- "version": "2.3.0", +- "requires": { +- "ansi-escapes": "^3.0.0", +- "cli-cursor": "^2.0.0", +- "wrap-ansi": "^3.0.1" +- }, +- "dependencies": { +- "ansi-escapes": { +- "version": "3.2.0" +- }, +- "cli-cursor": { +- "version": "2.1.0", +- "requires": { +- "restore-cursor": "^2.0.0" +- } +- }, +- "mimic-fn": { +- "version": "1.2.0" +- }, +- "onetime": { +- "version": "2.0.1", +- "requires": { +- "mimic-fn": "^1.0.0" +- } +- }, +- "restore-cursor": { +- "version": "2.0.0", +- "requires": { +- "onetime": "^2.0.0", +- "signal-exit": "^3.0.2" +- } +- } +- } +- }, +- "long": { +- "version": "5.2.3" +- }, +- "lower-case": { +- "version": "2.0.2", +- "requires": { +- "tslib": "^2.0.3" +- } +- }, +- "lowercase-keys": { +- "version": "2.0.0" +- }, +- "lru-cache": { +- "version": "5.1.1", +- "requires": { +- "yallist": "^3.0.2" +- } +- }, +- "magic-string": { +- "version": "0.25.9", +- "requires": { +- "sourcemap-codec": "^1.4.8" +- } +- }, +- "make-dir": { +- "version": "3.1.0", +- "requires": { +- "semver": "^6.0.0" +- } +- }, +- "make-error": { +- "version": "1.3.6", +- "dev": true +- }, +- "map-obj": { +- "version": "4.3.0", +- "dev": true +- }, +- "marked": { +- "version": "12.0.0" +- }, +- "matcher": { +- "version": "3.0.0", +- "optional": true, +- "requires": { +- "escape-string-regexp": "^4.0.0" +- } +- }, +- "mathml-tag-names": { +- "version": "2.1.3", +- "dev": true +- }, +- "mdn-data": { +- "version": "2.0.30", +- "dev": true +- }, +- "media-typer": { +- "version": "0.3.0", +- "dev": true +- }, +- "memfs": { +- "version": "3.5.3", +- "dev": true, +- "requires": { +- "fs-monkey": "^1.0.4" +- } +- }, +- "meow": { +- "version": "8.1.2", +- "dev": true, +- "requires": { +- "@types/minimist": "^1.2.0", +- "camelcase-keys": "^6.2.2", +- "decamelize-keys": "^1.1.0", +- "hard-rejection": "^2.1.0", +- "minimist-options": "4.1.0", +- "normalize-package-data": "^3.0.0", +- "read-pkg-up": "^7.0.1", +- "redent": "^3.0.0", +- "trim-newlines": "^3.0.0", +- "type-fest": "^0.18.0", +- "yargs-parser": "^20.2.3" +- }, +- "dependencies": { +- "find-up": { +- "version": "4.1.0", +- "dev": true, +- "requires": { +- "locate-path": "^5.0.0", +- "path-exists": "^4.0.0" +- } +- }, +- "locate-path": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "p-locate": "^4.1.0" +- } +- }, +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "normalize-package-data": { +- "version": "3.0.3", +- "dev": true, +- "requires": { +- "hosted-git-info": "^4.0.1", +- "is-core-module": "^2.5.0", +- "semver": "^7.3.4", +- "validate-npm-package-license": "^3.0.1" +- } +- }, +- "p-limit": { +- "version": "2.3.0", +- "dev": true, +- "requires": { +- "p-try": "^2.0.0" +- } +- }, +- "p-locate": { +- "version": "4.1.0", +- "dev": true, +- "requires": { +- "p-limit": "^2.2.0" +- } +- }, +- "p-try": { +- "version": "2.2.0", +- "dev": true +- }, +- "parse-json": { +- "version": "5.2.0", +- "dev": true, +- "requires": { +- "@babel/code-frame": "^7.0.0", +- "error-ex": "^1.3.1", +- "json-parse-even-better-errors": "^2.3.0", +- "lines-and-columns": "^1.1.6" +- } +- }, +- "path-exists": { +- "version": "4.0.0", +- "dev": true +- }, +- "read-pkg": { +- "version": "5.2.0", +- "dev": true, +- "requires": { +- "@types/normalize-package-data": "^2.4.0", +- "normalize-package-data": "^2.5.0", +- "parse-json": "^5.0.0", +- "type-fest": "^0.6.0" +- }, +- "dependencies": { +- "hosted-git-info": { +- "version": "2.8.9", +- "dev": true +- }, +- "normalize-package-data": { +- "version": "2.5.0", +- "dev": true, +- "requires": { +- "hosted-git-info": "^2.1.4", +- "resolve": "^1.10.0", +- "semver": "2 || 3 || 4 || 5", +- "validate-npm-package-license": "^3.0.1" +- } +- }, +- "semver": { +- "version": "5.7.2", +- "dev": true +- }, +- "type-fest": { +- "version": "0.6.0", +- "dev": true +- } +- } +- }, +- "read-pkg-up": { +- "version": "7.0.1", +- "dev": true, +- "requires": { +- "find-up": "^4.1.0", +- "read-pkg": "^5.2.0", +- "type-fest": "^0.8.1" +- }, +- "dependencies": { +- "type-fest": { +- "version": "0.8.1", +- "dev": true +- } +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "type-fest": { +- "version": "0.18.1", +- "dev": true +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "merge-descriptors": { +- "version": "1.0.1", +- "dev": true +- }, +- "merge-stream": { +- "version": "2.0.0" +- }, +- "merge2": { +- "version": "1.4.1", +- "dev": true +- }, +- "methods": { +- "version": "1.1.2", +- "dev": true +- }, +- "micromatch": { +- "version": "4.0.5", +- "requires": { +- "braces": "^3.0.2", +- "picomatch": "^2.3.1" +- } +- }, +- "mime": { +- "version": "2.6.0", +- "dev": true +- }, +- "mime-db": { +- "version": "1.52.0" +- }, +- "mime-types": { +- "version": "2.1.35", +- "requires": { +- "mime-db": "1.52.0" +- } +- }, +- "mimic-fn": { +- "version": "3.1.0" +- }, +- "mimic-response": { +- "version": "1.0.1" +- }, +- "min-indent": { +- "version": "1.0.1", +- "dev": true +- }, +- "mini-css-extract-plugin": { +- "version": "2.4.7", +- "requires": { +- "schema-utils": "^4.0.0" +- }, +- "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "ajv-keywords": { +- "version": "5.1.0", +- "requires": { +- "fast-deep-equal": "^3.1.3" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0" +- }, +- "schema-utils": { +- "version": "4.2.0", +- "requires": { +- "@types/json-schema": "^7.0.9", +- "ajv": "^8.9.0", +- "ajv-formats": "^2.1.1", +- "ajv-keywords": "^5.1.0" +- } +- } +- } +- }, +- "minimalistic-assert": { +- "version": "1.0.1", +- "dev": true +- }, +- "minimatch": { +- "version": "5.1.6", +- "dev": true, +- "requires": { +- "brace-expansion": "^2.0.1" +- } +- }, +- "minimist": { +- "version": "1.2.8" +- }, +- "minimist-options": { +- "version": "4.1.0", +- "dev": true, +- "requires": { +- "arrify": "^1.0.1", +- "is-plain-obj": "^1.1.0", +- "kind-of": "^6.0.3" +- } +- }, +- "minipass": { +- "version": "5.0.0", +- "dev": true +- }, +- "minizlib": { +- "version": "2.1.2", +- "dev": true, +- "requires": { +- "minipass": "^3.0.0", +- "yallist": "^4.0.0" +- }, +- "dependencies": { +- "minipass": { +- "version": "3.3.6", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "mkdirp": { +- "version": "0.5.6", +- "requires": { +- "minimist": "^1.2.6" +- } +- }, +- "mkdirp-classic": { +- "version": "0.5.3" +- }, +- "modify-values": { +- "version": "1.0.1", +- "dev": true +- }, +- "moment": { +- "version": "2.30.1" +- }, +- "moo": { +- "version": "0.5.2" +- }, +- "ms": { +- "version": "2.1.2" +- }, +- "multicast-dns": { +- "version": "7.2.5", +- "dev": true, +- "requires": { +- "dns-packet": "^5.2.2", +- "thunky": "^1.0.2" +- } +- }, +- "mute-stream": { +- "version": "0.0.8", +- "dev": true +- }, +- "mysql2": { +- "version": "3.9.7", +- "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.7.tgz", +- "integrity": "sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw==", +- "requires": { +- "denque": "^2.1.0", +- "generate-function": "^2.3.1", +- "iconv-lite": "^0.6.3", +- "long": "^5.2.1", +- "lru-cache": "^8.0.0", +- "named-placeholders": "^1.1.3", +- "seq-queue": "^0.0.5", +- "sqlstring": "^2.3.2" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "8.0.5" +- } +- } +- }, +- "named-placeholders": { +- "version": "1.1.3", +- "requires": { +- "lru-cache": "^7.14.1" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "7.18.3" +- } +- } +- }, +- "nan": { +- "version": "2.19.0" +- }, +- "nanoid": { +- "version": "3.3.7" +- }, +- "napi-build-utils": { +- "version": "1.0.2" +- }, +- "natural-compare": { +- "version": "1.4.0", +- "dev": true +- }, +- "nearley": { +- "version": "2.20.1", +- "requires": { +- "commander": "^2.19.0", +- "moo": "^0.5.0", +- "railroad-diagrams": "^1.0.0", +- "randexp": "0.4.6" +- }, +- "dependencies": { +- "commander": { +- "version": "2.20.3" +- } +- } +- }, +- "negotiator": { +- "version": "0.6.3", +- "dev": true +- }, +- "neo-async": { +- "version": "2.6.2" +- }, +- "no-case": { +- "version": "3.0.4", +- "requires": { +- "lower-case": "^2.0.2", +- "tslib": "^2.0.3" +- } +- }, +- "node-abi": { +- "version": "3.51.0", +- "requires": { +- "semver": "^7.3.5" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0" +- } +- } +- }, +- "node-fetch": { +- "version": "2.7.0", +- "dev": true, +- "requires": { +- "whatwg-url": "^5.0.0" +- } +- }, +- "node-firebird": { +- "version": "1.1.8", +- "resolved": "https://registry.npmjs.org/node-firebird/-/node-firebird-1.1.8.tgz", +- "integrity": "sha512-G64hTeb5hsIocxau76ba9G/htT0Uy6ouJoYQ9zaWuui2GRbQUNxvuc9YMT8I2Mh+/66/+r0rhrV8xQEYwUtPKw==", +- "requires": { +- "big-integer": "^1.6.51", +- "long": "^5.2.3" +- } +- }, +- "node-forge": { +- "version": "1.3.1", +- "dev": true +- }, +- "node-loader": { +- "version": "2.0.0", +- "requires": { +- "loader-utils": "^2.0.0" +- } +- }, +- "node-releases": { +- "version": "2.0.13" +- }, +- "normalize-package-data": { +- "version": "2.5.0", +- "dev": true, +- "requires": { +- "hosted-git-info": "^2.1.4", +- "resolve": "^1.10.0", +- "semver": "2 || 3 || 4 || 5", +- "validate-npm-package-license": "^3.0.1" +- }, +- "dependencies": { +- "hosted-git-info": { +- "version": "2.8.9", +- "dev": true +- }, +- "semver": { +- "version": "5.7.2", +- "dev": true +- } +- } +- }, +- "normalize-path": { +- "version": "3.0.0" +- }, +- "normalize-url": { +- "version": "6.1.0" +- }, +- "npm-run-path": { +- "version": "4.0.1", +- "requires": { +- "path-key": "^3.0.0" +- } +- }, +- "nth-check": { +- "version": "2.1.1", +- "requires": { +- "boolbase": "^1.0.0" +- } +- }, +- "null-check": { +- "version": "1.0.0", +- "dev": true +- }, +- "object-inspect": { +- "version": "1.13.1", +- "dev": true +- }, +- "object-keys": { +- "version": "1.1.1", +- "devOptional": true +- }, +- "object.assign": { +- "version": "4.1.4", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.1.4", +- "has-symbols": "^1.0.3", +- "object-keys": "^1.1.1" +- } +- }, +- "object.values": { +- "version": "1.1.7", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1" +- } +- }, +- "obuf": { +- "version": "1.1.2", +- "dev": true +- }, +- "on-finished": { +- "version": "2.4.1", +- "dev": true, +- "requires": { +- "ee-first": "1.1.1" +- } +- }, +- "on-headers": { +- "version": "1.0.2", +- "dev": true +- }, +- "once": { +- "version": "1.4.0", +- "requires": { +- "wrappy": "1" +- } +- }, +- "onetime": { +- "version": "5.1.2", +- "requires": { +- "mimic-fn": "^2.1.0" +- }, +- "dependencies": { +- "mimic-fn": { +- "version": "2.1.0" +- } +- } +- }, +- "open": { +- "version": "8.4.2", +- "dev": true, +- "requires": { +- "define-lazy-prop": "^2.0.0", +- "is-docker": "^2.1.1", +- "is-wsl": "^2.2.0" +- } +- }, +- "optionator": { +- "version": "0.9.3", +- "dev": true, +- "requires": { +- "@aashutoshrathi/word-wrap": "^1.2.3", +- "deep-is": "^0.1.3", +- "fast-levenshtein": "^2.0.6", +- "levn": "^0.4.1", +- "prelude-ls": "^1.2.1", +- "type-check": "^0.4.0" +- } +- }, +- "os-tmpdir": { +- "version": "1.0.2", +- "dev": true +- }, +- "p-cancelable": { +- "version": "2.1.1" +- }, +- "p-limit": { +- "version": "1.3.0", +- "dev": true, +- "requires": { +- "p-try": "^1.0.0" +- } +- }, +- "p-locate": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "p-limit": "^1.1.0" +- } +- }, +- "p-retry": { +- "version": "4.6.2", +- "dev": true, +- "requires": { +- "@types/retry": "0.12.0", +- "retry": "^0.13.1" +- }, +- "dependencies": { +- "retry": { +- "version": "0.13.1", +- "dev": true +- } +- } +- }, +- "p-try": { +- "version": "1.0.0", +- "dev": true +- }, +- "pako": { +- "version": "1.0.11" +- }, +- "param-case": { +- "version": "3.0.4", +- "requires": { +- "dot-case": "^3.0.4", +- "tslib": "^2.0.3" +- } +- }, +- "parent-module": { +- "version": "1.0.1", +- "dev": true, +- "requires": { +- "callsites": "^3.0.0" +- } +- }, +- "parse-json": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "error-ex": "^1.3.1", +- "json-parse-better-errors": "^1.0.1" +- } +- }, +- "parseurl": { +- "version": "1.3.3", +- "dev": true +- }, +- "pascal-case": { +- "version": "3.1.2", +- "requires": { +- "no-case": "^3.0.4", +- "tslib": "^2.0.3" +- } +- }, +- "path-exists": { +- "version": "3.0.0" +- }, +- "path-is-absolute": { +- "version": "1.0.1" +- }, +- "path-key": { +- "version": "3.1.1" +- }, +- "path-parse": { +- "version": "1.0.7" +- }, +- "path-scurry": { +- "version": "1.11.1", +- "dev": true, +- "requires": { +- "lru-cache": "^10.2.0", +- "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "10.2.2", +- "dev": true +- } +- } +- }, +- "path-to-regexp": { +- "version": "0.1.7", +- "dev": true +- }, +- "path-type": { +- "version": "4.0.0", +- "dev": true +- }, +- "pegjs": { +- "version": "0.10.0", +- "dev": true +- }, +- "pend": { +- "version": "1.2.0" +- }, +- "pg": { +- "version": "8.11.5", +- "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.5.tgz", +- "integrity": "sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==", +- "requires": { +- "pg-cloudflare": "^1.1.1", +- "pg-connection-string": "^2.6.4", +- "pg-pool": "^3.6.2", +- "pg-protocol": "^1.6.1", +- "pg-types": "^2.1.0", +- "pgpass": "1.x" +- }, +- "dependencies": { +- "pg-connection-string": { +- "version": "2.6.4", +- "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz", +- "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==" +- } +- } +- }, +- "pg-cloudflare": { +- "version": "1.1.1", +- "optional": true +- }, +- "pg-connection-string": { +- "version": "2.5.0" +- }, +- "pg-cursor": { +- "version": "2.10.3", +- "requires": {} +- }, +- "pg-int8": { +- "version": "1.0.1" +- }, +- "pg-pool": { +- "version": "3.6.2", +- "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz", +- "integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==", +- "requires": {} +- }, +- "pg-protocol": { +- "version": "1.6.1", +- "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz", +- "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==" +- }, +- "pg-query-stream": { +- "version": "4.2.4", +- "requires": { +- "pg-cursor": "^2.7.4" +- } +- }, +- "pg-types": { +- "version": "2.2.0", +- "requires": { +- "pg-int8": "1.0.1", +- "postgres-array": "~2.0.0", +- "postgres-bytea": "~1.0.0", +- "postgres-date": "~1.0.4", +- "postgres-interval": "^1.1.0" +- } +- }, +- "pgpass": { +- "version": "1.0.5", +- "requires": { +- "split2": "^4.1.0" +- } +- }, +- "pgsql-ast-parser": { +- "version": "7.2.1", +- "requires": { +- "moo": "^0.5.1", +- "nearley": "^2.19.5" +- } +- }, +- "picocolors": { +- "version": "1.0.0" +- }, +- "picomatch": { +- "version": "2.3.1" +- }, +- "pify": { +- "version": "5.0.0", +- "dev": true +- }, +- "pinia": { +- "version": "2.1.7", +- "requires": { +- "@vue/devtools-api": "^6.5.0", +- "vue-demi": ">=0.14.5" +- }, +- "dependencies": { +- "vue-demi": { +- "version": "0.14.6", +- "requires": {} +- } +- } +- }, +- "pkg-dir": { +- "version": "4.2.0", +- "requires": { +- "find-up": "^4.0.0" +- }, +- "dependencies": { +- "find-up": { +- "version": "4.1.0", +- "requires": { +- "locate-path": "^5.0.0", +- "path-exists": "^4.0.0" +- } +- }, +- "locate-path": { +- "version": "5.0.0", +- "requires": { +- "p-locate": "^4.1.0" +- } +- }, +- "p-limit": { +- "version": "2.3.0", +- "requires": { +- "p-try": "^2.0.0" +- } +- }, +- "p-locate": { +- "version": "4.1.0", +- "requires": { +- "p-limit": "^2.2.0" +- } +- }, +- "p-try": { +- "version": "2.2.0" +- }, +- "path-exists": { +- "version": "4.0.0" +- } +- } +- }, +- "pkg-up": { +- "version": "3.1.0", +- "requires": { +- "find-up": "^3.0.0" +- }, +- "dependencies": { +- "find-up": { +- "version": "3.0.0", +- "requires": { +- "locate-path": "^3.0.0" +- } +- }, +- "locate-path": { +- "version": "3.0.0", +- "requires": { +- "p-locate": "^3.0.0", +- "path-exists": "^3.0.0" +- } +- }, +- "p-limit": { +- "version": "2.3.0", +- "requires": { +- "p-try": "^2.0.0" +- } +- }, +- "p-locate": { +- "version": "3.0.0", +- "requires": { +- "p-limit": "^2.0.0" +- } +- }, +- "p-try": { +- "version": "2.2.0" +- } +- } +- }, +- "playwright": { +- "version": "1.28.1", +- "dev": true, +- "requires": { +- "playwright-core": "1.28.1" +- } +- }, +- "playwright-core": { +- "version": "1.28.1", +- "dev": true +- }, +- "plist": { +- "version": "3.1.0", +- "dev": true, +- "requires": { +- "@xmldom/xmldom": "^0.8.8", +- "base64-js": "^1.5.1", +- "xmlbuilder": "^15.1.1" +- } +- }, +- "postcss": { +- "version": "8.4.38", +- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", +- "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", +- "requires": { +- "nanoid": "^3.3.7", +- "picocolors": "^1.0.0", +- "source-map-js": "^1.2.0" +- } +- }, +- "postcss-html": { +- "version": "1.5.0", +- "requires": { +- "htmlparser2": "^8.0.0", +- "js-tokens": "^8.0.0", +- "postcss": "^8.4.0", +- "postcss-safe-parser": "^6.0.0" +- }, +- "dependencies": { +- "js-tokens": { +- "version": "8.0.2" +- } +- } +- }, +- "postcss-media-query-parser": { +- "version": "0.2.3", +- "dev": true +- }, +- "postcss-modules-extract-imports": { +- "version": "3.0.0", +- "requires": {} +- }, +- "postcss-modules-local-by-default": { +- "version": "4.0.3", +- "requires": { +- "icss-utils": "^5.0.0", +- "postcss-selector-parser": "^6.0.2", +- "postcss-value-parser": "^4.1.0" +- } +- }, +- "postcss-modules-scope": { +- "version": "3.0.0", +- "requires": { +- "postcss-selector-parser": "^6.0.4" +- } +- }, +- "postcss-modules-values": { +- "version": "4.0.0", +- "requires": { +- "icss-utils": "^5.0.0" +- } +- }, +- "postcss-resolve-nested-selector": { +- "version": "0.1.1", +- "dev": true +- }, +- "postcss-safe-parser": { +- "version": "6.0.0", +- "requires": {} +- }, +- "postcss-selector-parser": { +- "version": "6.0.13", +- "requires": { +- "cssesc": "^3.0.0", +- "util-deprecate": "^1.0.2" +- } +- }, +- "postcss-value-parser": { +- "version": "4.2.0" +- }, +- "postgres-array": { +- "version": "2.0.0" +- }, +- "postgres-bytea": { +- "version": "1.0.0" +- }, +- "postgres-date": { +- "version": "1.0.7" +- }, +- "postgres-interval": { +- "version": "1.2.0", +- "requires": { +- "xtend": "^4.0.0" +- } +- }, +- "prebuild-install": { +- "version": "7.1.1", +- "requires": { +- "detect-libc": "^2.0.0", +- "expand-template": "^2.0.3", +- "github-from-package": "0.0.0", +- "minimist": "^1.2.3", +- "mkdirp-classic": "^0.5.3", +- "napi-build-utils": "^1.0.1", +- "node-abi": "^3.3.0", +- "pump": "^3.0.0", +- "rc": "^1.2.7", +- "simple-get": "^4.0.0", +- "tar-fs": "^2.0.0", +- "tunnel-agent": "^0.6.0" +- } +- }, +- "prelude-ls": { +- "version": "1.2.1", +- "dev": true +- }, +- "pretty-error": { +- "version": "4.0.0", +- "requires": { +- "lodash": "^4.17.20", +- "renderkid": "^3.0.0" +- } +- }, +- "process-nextick-args": { +- "version": "2.0.1" +- }, +- "progress": { +- "version": "2.0.3" +- }, +- "progress-webpack-plugin": { +- "version": "1.0.16", +- "requires": { +- "chalk": "^2.1.0", +- "figures": "^2.0.0", +- "log-update": "^2.3.0" +- }, +- "dependencies": { +- "ansi-styles": { +- "version": "3.2.1", +- "requires": { +- "color-convert": "^1.9.0" +- } +- }, +- "chalk": { +- "version": "2.4.2", +- "requires": { +- "ansi-styles": "^3.2.1", +- "escape-string-regexp": "^1.0.5", +- "supports-color": "^5.3.0" +- } +- }, +- "color-convert": { +- "version": "1.9.3", +- "requires": { +- "color-name": "1.1.3" +- } +- }, +- "color-name": { +- "version": "1.1.3" +- }, +- "escape-string-regexp": { +- "version": "1.0.5" +- }, +- "figures": { +- "version": "2.0.0", +- "requires": { +- "escape-string-regexp": "^1.0.5" +- } +- }, +- "has-flag": { +- "version": "3.0.0" +- }, +- "supports-color": { +- "version": "5.5.0", +- "requires": { +- "has-flag": "^3.0.0" +- } +- } +- } +- }, +- "promise-retry": { +- "version": "2.0.1", +- "dev": true, +- "requires": { +- "err-code": "^2.0.2", +- "retry": "^0.12.0" +- } +- }, +- "proxy-addr": { +- "version": "2.0.7", +- "dev": true, +- "requires": { +- "forwarded": "0.2.0", +- "ipaddr.js": "1.9.1" +- }, +- "dependencies": { +- "ipaddr.js": { +- "version": "1.9.1", +- "dev": true +- } +- } +- }, +- "pump": { +- "version": "3.0.0", +- "requires": { +- "end-of-stream": "^1.1.0", +- "once": "^1.3.1" +- } +- }, +- "punycode": { +- "version": "2.3.1" +- }, +- "q": { +- "version": "1.5.1", +- "dev": true +- }, +- "qs": { +- "version": "6.11.0", +- "dev": true, +- "requires": { +- "side-channel": "^1.0.4" +- } +- }, +- "queue-microtask": { +- "version": "1.2.3", +- "dev": true +- }, +- "quick-lru": { +- "version": "5.1.1" +- }, +- "railroad-diagrams": { +- "version": "1.0.0" +- }, +- "randexp": { +- "version": "0.4.6", +- "requires": { +- "discontinuous-range": "1.0.0", +- "ret": "~0.1.10" +- } +- }, +- "randombytes": { +- "version": "2.1.0", +- "requires": { +- "safe-buffer": "^5.1.0" +- } +- }, +- "range-parser": { +- "version": "1.2.1", +- "dev": true +- }, +- "raw-body": { +- "version": "2.5.2", +- "dev": true, +- "requires": { +- "bytes": "3.1.2", +- "http-errors": "2.0.0", +- "iconv-lite": "0.4.24", +- "unpipe": "1.0.0" +- }, +- "dependencies": { +- "bytes": { +- "version": "3.1.2", +- "dev": true +- }, +- "iconv-lite": { +- "version": "0.4.24", +- "dev": true, +- "requires": { +- "safer-buffer": ">= 2.1.2 < 3" +- } +- } +- } +- }, +- "rc": { +- "version": "1.2.8", +- "requires": { +- "deep-extend": "^0.6.0", +- "ini": "~1.3.0", +- "minimist": "^1.2.0", +- "strip-json-comments": "~2.0.1" +- }, +- "dependencies": { +- "strip-json-comments": { +- "version": "2.0.1" +- } +- } +- }, +- "read-config-file": { +- "version": "6.3.2", +- "dev": true, +- "requires": { +- "config-file-ts": "^0.2.4", +- "dotenv": "^9.0.2", +- "dotenv-expand": "^5.1.0", +- "js-yaml": "^4.1.0", +- "json5": "^2.2.0", +- "lazy-val": "^1.0.4" +- } +- }, +- "read-pkg": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "load-json-file": "^4.0.0", +- "normalize-package-data": "^2.3.2", +- "path-type": "^3.0.0" +- }, +- "dependencies": { +- "path-type": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "pify": "^3.0.0" +- } +- }, +- "pify": { +- "version": "3.0.0", +- "dev": true +- } +- } +- }, +- "read-pkg-up": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "find-up": "^2.0.0", +- "read-pkg": "^3.0.0" +- } +- }, +- "readable-stream": { +- "version": "3.6.2", +- "requires": { +- "inherits": "^2.0.3", +- "string_decoder": "^1.1.1", +- "util-deprecate": "^1.0.1" +- } +- }, +- "readdir-glob": { +- "version": "1.1.3", +- "dev": true, +- "peer": true, +- "requires": { +- "minimatch": "^5.1.0" +- } +- }, +- "readdirp": { +- "version": "3.6.0", +- "requires": { +- "picomatch": "^2.2.1" +- } +- }, +- "rechoir": { +- "version": "0.7.1", +- "requires": { +- "resolve": "^1.9.0" +- } +- }, +- "redent": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "indent-string": "^4.0.0", +- "strip-indent": "^3.0.0" +- } +- }, +- "regenerate": { +- "version": "1.4.2", +- "dev": true +- }, +- "regenerate-unicode-properties": { +- "version": "10.1.1", +- "dev": true, +- "requires": { +- "regenerate": "^1.4.2" +- } +- }, +- "regenerator-runtime": { +- "version": "0.14.0", +- "dev": true +- }, +- "regenerator-transform": { +- "version": "0.15.2", +- "dev": true, +- "requires": { +- "@babel/runtime": "^7.8.4" +- } +- }, +- "regexp.prototype.flags": { +- "version": "1.5.1", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "set-function-name": "^2.0.0" +- } +- }, +- "regexpp": { +- "version": "3.2.0", +- "dev": true +- }, +- "regexpu-core": { +- "version": "5.3.2", +- "dev": true, +- "requires": { +- "@babel/regjsgen": "^0.8.0", +- "regenerate": "^1.4.2", +- "regenerate-unicode-properties": "^10.1.0", +- "regjsparser": "^0.9.1", +- "unicode-match-property-ecmascript": "^2.0.0", +- "unicode-match-property-value-ecmascript": "^2.1.0" +- } +- }, +- "regjsparser": { +- "version": "0.9.1", +- "dev": true, +- "requires": { +- "jsesc": "~0.5.0" +- }, +- "dependencies": { +- "jsesc": { +- "version": "0.5.0", +- "dev": true +- } +- } +- }, +- "relateurl": { +- "version": "0.2.7" +- }, +- "renderkid": { +- "version": "3.0.0", +- "requires": { +- "css-select": "^4.1.3", +- "dom-converter": "^0.2.0", +- "htmlparser2": "^6.1.0", +- "lodash": "^4.17.21", +- "strip-ansi": "^6.0.1" +- }, +- "dependencies": { +- "dom-serializer": { +- "version": "1.4.1", +- "requires": { +- "domelementtype": "^2.0.1", +- "domhandler": "^4.2.0", +- "entities": "^2.0.0" +- } +- }, +- "domhandler": { +- "version": "4.3.1", +- "requires": { +- "domelementtype": "^2.2.0" +- } +- }, +- "domutils": { +- "version": "2.8.0", +- "requires": { +- "dom-serializer": "^1.0.1", +- "domelementtype": "^2.2.0", +- "domhandler": "^4.2.0" +- } +- }, +- "entities": { +- "version": "2.2.0" +- }, +- "htmlparser2": { +- "version": "6.1.0", +- "requires": { +- "domelementtype": "^2.0.1", +- "domhandler": "^4.0.0", +- "domutils": "^2.5.2", +- "entities": "^2.0.0" +- } +- } +- } +- }, +- "require-directory": { +- "version": "2.1.1", +- "dev": true +- }, +- "require-from-string": { +- "version": "2.0.2" +- }, +- "require-main-filename": { +- "version": "2.0.0", +- "dev": true +- }, +- "requires-port": { +- "version": "1.0.0", +- "dev": true +- }, +- "resolve": { +- "version": "1.22.8", +- "requires": { +- "is-core-module": "^2.13.0", +- "path-parse": "^1.0.7", +- "supports-preserve-symlinks-flag": "^1.0.0" +- } +- }, +- "resolve-alpn": { +- "version": "1.2.1" +- }, +- "resolve-cwd": { +- "version": "3.0.0", +- "requires": { +- "resolve-from": "^5.0.0" +- }, +- "dependencies": { +- "resolve-from": { +- "version": "5.0.0" +- } +- } +- }, +- "resolve-from": { +- "version": "4.0.0", +- "dev": true +- }, +- "responselike": { +- "version": "2.0.1", +- "requires": { +- "lowercase-keys": "^2.0.0" +- } +- }, +- "restore-cursor": { +- "version": "3.1.0", +- "dev": true, +- "requires": { +- "onetime": "^5.1.0", +- "signal-exit": "^3.0.2" +- } +- }, +- "ret": { +- "version": "0.1.15" +- }, +- "retry": { +- "version": "0.12.0", +- "dev": true +- }, +- "reusify": { +- "version": "1.0.4", +- "dev": true +- }, +- "rimraf": { +- "version": "3.0.2", +- "requires": { +- "glob": "^7.1.3" +- } +- }, +- "roarr": { +- "version": "2.15.4", +- "optional": true, +- "requires": { +- "boolean": "^3.0.1", +- "detect-node": "^2.0.4", +- "globalthis": "^1.0.1", +- "json-stringify-safe": "^5.0.1", +- "semver-compare": "^1.0.0", +- "sprintf-js": "^1.1.2" +- } +- }, +- "run-async": { +- "version": "2.4.1", +- "dev": true +- }, +- "run-parallel": { +- "version": "1.2.0", +- "dev": true, +- "requires": { +- "queue-microtask": "^1.2.2" +- } +- }, +- "rxjs": { +- "version": "6.6.7", +- "dev": true, +- "requires": { +- "tslib": "^1.9.0" +- }, +- "dependencies": { +- "tslib": { +- "version": "1.14.1", +- "dev": true +- } +- } +- }, +- "safe-array-concat": { +- "version": "1.0.1", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "get-intrinsic": "^1.2.1", +- "has-symbols": "^1.0.3", +- "isarray": "^2.0.5" +- } +- }, +- "safe-buffer": { +- "version": "5.2.1" +- }, +- "safe-regex-test": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "get-intrinsic": "^1.1.3", +- "is-regex": "^1.1.4" +- } +- }, +- "safer-buffer": { +- "version": "2.1.2" +- }, +- "sanitize-filename": { +- "version": "1.6.3", +- "dev": true, +- "requires": { +- "truncate-utf8-bytes": "^1.0.0" +- } +- }, +- "sass": { +- "version": "1.42.1", +- "requires": { +- "chokidar": ">=3.0.0 <4.0.0" +- } +- }, +- "sass-loader": { +- "version": "12.3.0", +- "requires": { +- "klona": "^2.0.4", +- "neo-async": "^2.6.2" +- } +- }, +- "sax": { +- "version": "1.3.0" +- }, +- "schema-utils": { +- "version": "2.7.1", +- "requires": { +- "@types/json-schema": "^7.0.5", +- "ajv": "^6.12.4", +- "ajv-keywords": "^3.5.2" +- } +- }, +- "select-hose": { +- "version": "2.0.0", +- "dev": true +- }, +- "selfsigned": { +- "version": "2.4.1", +- "dev": true, +- "requires": { +- "@types/node-forge": "^1.3.0", +- "node-forge": "^1" +- } +- }, +- "semver": { +- "version": "6.3.1" +- }, +- "semver-compare": { +- "version": "1.0.0", +- "optional": true +- }, +- "send": { +- "version": "0.18.0", +- "dev": true, +- "requires": { +- "debug": "2.6.9", +- "depd": "2.0.0", +- "destroy": "1.2.0", +- "encodeurl": "~1.0.2", +- "escape-html": "~1.0.3", +- "etag": "~1.8.1", +- "fresh": "0.5.2", +- "http-errors": "2.0.0", +- "mime": "1.6.0", +- "ms": "2.1.3", +- "on-finished": "2.4.1", +- "range-parser": "~1.2.1", +- "statuses": "2.0.1" +- }, +- "dependencies": { +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- }, +- "dependencies": { +- "ms": { +- "version": "2.0.0", +- "dev": true +- } +- } +- }, +- "mime": { +- "version": "1.6.0", +- "dev": true +- }, +- "ms": { +- "version": "2.1.3", +- "dev": true +- } +- } +- }, +- "seq-queue": { +- "version": "0.0.5" +- }, +- "serialize-error": { +- "version": "7.0.1", +- "optional": true, +- "requires": { +- "type-fest": "^0.13.1" +- }, +- "dependencies": { +- "type-fest": { +- "version": "0.13.1", +- "optional": true +- } +- } +- }, +- "serialize-javascript": { +- "version": "6.0.2", +- "requires": { +- "randombytes": "^2.1.0" +- } +- }, +- "serve-index": { +- "version": "1.9.1", +- "dev": true, +- "requires": { +- "accepts": "~1.3.4", +- "batch": "0.6.1", +- "debug": "2.6.9", +- "escape-html": "~1.0.3", +- "http-errors": "~1.6.2", +- "mime-types": "~2.1.17", +- "parseurl": "~1.3.2" +- }, +- "dependencies": { +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "depd": { +- "version": "1.1.2", +- "dev": true +- }, +- "http-errors": { +- "version": "1.6.3", +- "dev": true, +- "requires": { +- "depd": "~1.1.2", +- "inherits": "2.0.3", +- "setprototypeof": "1.1.0", +- "statuses": ">= 1.4.0 < 2" +- } +- }, +- "inherits": { +- "version": "2.0.3", +- "dev": true +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- }, +- "setprototypeof": { +- "version": "1.1.0", +- "dev": true +- }, +- "statuses": { +- "version": "1.5.0", +- "dev": true +- } +- } +- }, +- "serve-static": { +- "version": "1.15.0", +- "dev": true, +- "requires": { +- "encodeurl": "~1.0.2", +- "escape-html": "~1.0.3", +- "parseurl": "~1.3.3", +- "send": "0.18.0" +- } +- }, +- "set-blocking": { +- "version": "2.0.0", +- "dev": true +- }, +- "set-function-length": { +- "version": "1.1.1", +- "dev": true, +- "requires": { +- "define-data-property": "^1.1.1", +- "get-intrinsic": "^1.2.1", +- "gopd": "^1.0.1", +- "has-property-descriptors": "^1.0.0" +- } +- }, +- "set-function-name": { +- "version": "2.0.1", +- "dev": true, +- "requires": { +- "define-data-property": "^1.0.1", +- "functions-have-names": "^1.2.3", +- "has-property-descriptors": "^1.0.0" +- } +- }, +- "setimmediate": { +- "version": "1.0.5" +- }, +- "setprototypeof": { +- "version": "1.2.0", +- "dev": true +- }, +- "shallow-clone": { +- "version": "3.0.1", +- "requires": { +- "kind-of": "^6.0.2" +- } +- }, +- "shebang-command": { +- "version": "2.0.0", +- "requires": { +- "shebang-regex": "^3.0.0" +- } +- }, +- "shebang-regex": { +- "version": "3.0.0" +- }, +- "side-channel": { +- "version": "1.0.4", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.0", +- "get-intrinsic": "^1.0.2", +- "object-inspect": "^1.9.0" +- } +- }, +- "signal-exit": { +- "version": "3.0.7" +- }, +- "simple-concat": { +- "version": "1.0.1" +- }, +- "simple-get": { +- "version": "4.0.1", +- "requires": { +- "decompress-response": "^6.0.0", +- "once": "^1.3.1", +- "simple-concat": "^1.0.0" +- } +- }, +- "simple-update-notifier": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "semver": "^7.5.3" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "slash": { +- "version": "3.0.0", +- "dev": true +- }, +- "sockjs": { +- "version": "0.3.24", +- "dev": true, +- "requires": { +- "faye-websocket": "^0.11.3", +- "uuid": "^8.3.2", +- "websocket-driver": "^0.7.4" +- } +- }, +- "sortablejs": { +- "version": "1.14.0" +- }, +- "source-map": { +- "version": "0.6.1" +- }, +- "source-map-js": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", +- "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==" +- }, +- "source-map-support": { +- "version": "0.5.21", +- "requires": { +- "buffer-from": "^1.0.0", +- "source-map": "^0.6.0" +- } +- }, +- "sourcemap-codec": { +- "version": "1.4.8" +- }, +- "spdx-correct": { +- "version": "3.2.0", +- "dev": true, +- "requires": { +- "spdx-expression-parse": "^3.0.0", +- "spdx-license-ids": "^3.0.0" +- } +- }, +- "spdx-exceptions": { +- "version": "2.3.0", +- "dev": true +- }, +- "spdx-expression-parse": { +- "version": "3.0.1", +- "dev": true, +- "requires": { +- "spdx-exceptions": "^2.1.0", +- "spdx-license-ids": "^3.0.0" +- } +- }, +- "spdx-license-ids": { +- "version": "3.0.16", +- "dev": true +- }, +- "spdy": { +- "version": "4.0.2", +- "dev": true, +- "requires": { +- "debug": "^4.1.0", +- "handle-thing": "^2.0.0", +- "http-deceiver": "^1.2.7", +- "select-hose": "^2.0.0", +- "spdy-transport": "^3.0.0" +- } +- }, +- "spdy-transport": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "debug": "^4.1.0", +- "detect-node": "^2.0.4", +- "hpack.js": "^2.1.6", +- "obuf": "^1.1.2", +- "readable-stream": "^3.0.6", +- "wbuf": "^1.7.3" +- } +- }, +- "spectre.css": { +- "version": "0.5.9" +- }, +- "split": { +- "version": "1.0.1", +- "dev": true, +- "requires": { +- "through": "2" +- } +- }, +- "split2": { +- "version": "4.2.0" +- }, +- "sprintf-js": { +- "version": "1.1.2" +- }, +- "sql-formatter": { +- "version": "13.0.4", +- "requires": { +- "argparse": "^2.0.1", +- "get-stdin": "=8.0.0", +- "nearley": "^2.20.1" +- } +- }, +- "sql-highlight": { +- "version": "4.4.0" +- }, +- "sqlstring": { +- "version": "2.3.3" +- }, +- "ssh2": { +- "version": "1.14.0", +- "requires": { +- "asn1": "^0.2.6", +- "bcrypt-pbkdf": "^1.0.2", +- "cpu-features": "~0.0.8", +- "nan": "^2.17.0" +- } +- }, +- "standard-version": { +- "version": "9.3.2", +- "dev": true, +- "requires": { +- "chalk": "^2.4.2", +- "conventional-changelog": "3.1.24", +- "conventional-changelog-config-spec": "2.1.0", +- "conventional-changelog-conventionalcommits": "4.6.1", +- "conventional-recommended-bump": "6.1.0", +- "detect-indent": "^6.0.0", +- "detect-newline": "^3.1.0", +- "dotgitignore": "^2.1.0", +- "figures": "^3.1.0", +- "find-up": "^5.0.0", +- "fs-access": "^1.0.1", +- "git-semver-tags": "^4.0.0", +- "semver": "^7.1.1", +- "stringify-package": "^1.0.1", +- "yargs": "^16.0.0" +- }, +- "dependencies": { +- "ansi-styles": { +- "version": "3.2.1", +- "dev": true, +- "requires": { +- "color-convert": "^1.9.0" +- } +- }, +- "chalk": { +- "version": "2.4.2", +- "dev": true, +- "requires": { +- "ansi-styles": "^3.2.1", +- "escape-string-regexp": "^1.0.5", +- "supports-color": "^5.3.0" +- } +- }, +- "cliui": { +- "version": "7.0.4", +- "dev": true, +- "requires": { +- "string-width": "^4.2.0", +- "strip-ansi": "^6.0.0", +- "wrap-ansi": "^7.0.0" +- } +- }, +- "color-convert": { +- "version": "1.9.3", +- "dev": true, +- "requires": { +- "color-name": "1.1.3" +- } +- }, +- "color-name": { +- "version": "1.1.3", +- "dev": true +- }, +- "escape-string-regexp": { +- "version": "1.0.5", +- "dev": true +- }, +- "find-up": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "locate-path": "^6.0.0", +- "path-exists": "^4.0.0" +- } +- }, +- "has-flag": { +- "version": "3.0.0", +- "dev": true +- }, +- "locate-path": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "p-locate": "^5.0.0" +- } +- }, +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "p-limit": { +- "version": "3.1.0", +- "dev": true, +- "requires": { +- "yocto-queue": "^0.1.0" +- } +- }, +- "p-locate": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "p-limit": "^3.0.2" +- } +- }, +- "path-exists": { +- "version": "4.0.0", +- "dev": true +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "supports-color": { +- "version": "5.5.0", +- "dev": true, +- "requires": { +- "has-flag": "^3.0.0" +- } +- }, +- "wrap-ansi": { +- "version": "7.0.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^4.0.0", +- "string-width": "^4.1.0", +- "strip-ansi": "^6.0.0" +- }, +- "dependencies": { +- "ansi-styles": { +- "version": "4.3.0", +- "dev": true, +- "requires": { +- "color-convert": "^2.0.1" +- } +- }, +- "color-convert": { +- "version": "2.0.1", +- "dev": true, +- "requires": { +- "color-name": "~1.1.4" +- } +- }, +- "color-name": { +- "version": "1.1.4", +- "dev": true +- } +- } +- }, +- "y18n": { +- "version": "5.0.8", +- "dev": true +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- }, +- "yargs": { +- "version": "16.2.0", +- "dev": true, +- "requires": { +- "cliui": "^7.0.2", +- "escalade": "^3.1.1", +- "get-caller-file": "^2.0.5", +- "require-directory": "^2.1.1", +- "string-width": "^4.2.0", +- "y18n": "^5.0.5", +- "yargs-parser": "^20.2.2" +- } +- } +- } +- }, +- "stat-mode": { +- "version": "1.0.0", +- "dev": true +- }, +- "statuses": { +- "version": "2.0.1", +- "dev": true +- }, +- "string_decoder": { +- "version": "1.3.0", +- "requires": { +- "safe-buffer": "~5.2.0" +- } +- }, +- "string-width": { +- "version": "4.2.3", +- "dev": true, +- "requires": { +- "emoji-regex": "^8.0.0", +- "is-fullwidth-code-point": "^3.0.0", +- "strip-ansi": "^6.0.1" +- } +- }, +- "string-width-cjs": { +- "version": "npm:string-width@4.2.3", +- "dev": true, +- "requires": { +- "emoji-regex": "^8.0.0", +- "is-fullwidth-code-point": "^3.0.0", +- "strip-ansi": "^6.0.1" +- } +- }, +- "string.prototype.trim": { +- "version": "1.2.8", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1" +- } +- }, +- "string.prototype.trimend": { +- "version": "1.0.7", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1" +- } +- }, +- "string.prototype.trimstart": { +- "version": "1.0.7", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "define-properties": "^1.2.0", +- "es-abstract": "^1.22.1" +- } +- }, +- "stringify-package": { +- "version": "1.0.1", +- "dev": true +- }, +- "strip-ansi": { +- "version": "6.0.1", +- "requires": { +- "ansi-regex": "^5.0.1" +- } +- }, +- "strip-ansi-cjs": { +- "version": "npm:strip-ansi@6.0.1", +- "dev": true, +- "requires": { +- "ansi-regex": "^5.0.1" +- } +- }, +- "strip-bom": { +- "version": "3.0.0", +- "dev": true +- }, +- "strip-final-newline": { +- "version": "2.0.0" +- }, +- "strip-indent": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "min-indent": "^1.0.0" +- } +- }, +- "strip-json-comments": { +- "version": "3.1.1", +- "dev": true +- }, +- "style-loader": { +- "version": "3.3.3", +- "requires": {} +- }, +- "style-search": { +- "version": "0.1.0", +- "dev": true +- }, +- "stylelint": { +- "version": "15.11.0", +- "dev": true, +- "requires": { +- "@csstools/css-parser-algorithms": "^2.3.1", +- "@csstools/css-tokenizer": "^2.2.0", +- "@csstools/media-query-list-parser": "^2.1.4", +- "@csstools/selector-specificity": "^3.0.0", +- "balanced-match": "^2.0.0", +- "colord": "^2.9.3", +- "cosmiconfig": "^8.2.0", +- "css-functions-list": "^3.2.1", +- "css-tree": "^2.3.1", +- "debug": "^4.3.4", +- "fast-glob": "^3.3.1", +- "fastest-levenshtein": "^1.0.16", +- "file-entry-cache": "^7.0.0", +- "global-modules": "^2.0.0", +- "globby": "^11.1.0", +- "globjoin": "^0.1.4", +- "html-tags": "^3.3.1", +- "ignore": "^5.2.4", +- "import-lazy": "^4.0.0", +- "imurmurhash": "^0.1.4", +- "is-plain-object": "^5.0.0", +- "known-css-properties": "^0.29.0", +- "mathml-tag-names": "^2.1.3", +- "meow": "^10.1.5", +- "micromatch": "^4.0.5", +- "normalize-path": "^3.0.0", +- "picocolors": "^1.0.0", +- "postcss": "^8.4.28", +- "postcss-resolve-nested-selector": "^0.1.1", +- "postcss-safe-parser": "^6.0.0", +- "postcss-selector-parser": "^6.0.13", +- "postcss-value-parser": "^4.2.0", +- "resolve-from": "^5.0.0", +- "string-width": "^4.2.3", +- "strip-ansi": "^6.0.1", +- "style-search": "^0.1.0", +- "supports-hyperlinks": "^3.0.0", +- "svg-tags": "^1.0.0", +- "table": "^6.8.1", +- "write-file-atomic": "^5.0.1" +- }, +- "dependencies": { +- "balanced-match": { +- "version": "2.0.0", +- "dev": true +- }, +- "camelcase": { +- "version": "6.3.0", +- "dev": true +- }, +- "camelcase-keys": { +- "version": "7.0.2", +- "dev": true, +- "requires": { +- "camelcase": "^6.3.0", +- "map-obj": "^4.1.0", +- "quick-lru": "^5.1.1", +- "type-fest": "^1.2.1" +- } +- }, +- "cosmiconfig": { +- "version": "8.3.6", +- "dev": true, +- "requires": { +- "import-fresh": "^3.3.0", +- "js-yaml": "^4.1.0", +- "parse-json": "^5.2.0", +- "path-type": "^4.0.0" +- } +- }, +- "decamelize": { +- "version": "5.0.1", +- "dev": true +- }, +- "file-entry-cache": { +- "version": "7.0.2", +- "dev": true, +- "requires": { +- "flat-cache": "^3.2.0" +- } +- }, +- "find-up": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "locate-path": "^6.0.0", +- "path-exists": "^4.0.0" +- } +- }, +- "indent-string": { +- "version": "5.0.0", +- "dev": true +- }, +- "locate-path": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "p-locate": "^5.0.0" +- } +- }, +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "meow": { +- "version": "10.1.5", +- "dev": true, +- "requires": { +- "@types/minimist": "^1.2.2", +- "camelcase-keys": "^7.0.0", +- "decamelize": "^5.0.0", +- "decamelize-keys": "^1.1.0", +- "hard-rejection": "^2.1.0", +- "minimist-options": "4.1.0", +- "normalize-package-data": "^3.0.2", +- "read-pkg-up": "^8.0.0", +- "redent": "^4.0.0", +- "trim-newlines": "^4.0.2", +- "type-fest": "^1.2.2", +- "yargs-parser": "^20.2.9" +- } +- }, +- "normalize-package-data": { +- "version": "3.0.3", +- "dev": true, +- "requires": { +- "hosted-git-info": "^4.0.1", +- "is-core-module": "^2.5.0", +- "semver": "^7.3.4", +- "validate-npm-package-license": "^3.0.1" +- } +- }, +- "p-limit": { +- "version": "3.1.0", +- "dev": true, +- "requires": { +- "yocto-queue": "^0.1.0" +- } +- }, +- "p-locate": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "p-limit": "^3.0.2" +- } +- }, +- "parse-json": { +- "version": "5.2.0", +- "dev": true, +- "requires": { +- "@babel/code-frame": "^7.0.0", +- "error-ex": "^1.3.1", +- "json-parse-even-better-errors": "^2.3.0", +- "lines-and-columns": "^1.1.6" +- } +- }, +- "path-exists": { +- "version": "4.0.0", +- "dev": true +- }, +- "read-pkg": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "@types/normalize-package-data": "^2.4.0", +- "normalize-package-data": "^3.0.2", +- "parse-json": "^5.2.0", +- "type-fest": "^1.0.1" +- } +- }, +- "read-pkg-up": { +- "version": "8.0.0", +- "dev": true, +- "requires": { +- "find-up": "^5.0.0", +- "read-pkg": "^6.0.0", +- "type-fest": "^1.0.1" +- } +- }, +- "redent": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "indent-string": "^5.0.0", +- "strip-indent": "^4.0.0" +- } +- }, +- "resolve-from": { +- "version": "5.0.0", +- "dev": true +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "strip-indent": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "min-indent": "^1.0.1" +- } +- }, +- "trim-newlines": { +- "version": "4.1.1", +- "dev": true +- }, +- "type-fest": { +- "version": "1.4.0", +- "dev": true +- }, +- "typescript": { +- "version": "5.3.2", +- "dev": true, +- "optional": true, +- "peer": true +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "stylelint-config-html": { +- "version": "1.1.0", +- "dev": true, +- "requires": {} +- }, +- "stylelint-config-recommended": { +- "version": "13.0.0", +- "dev": true, +- "requires": {} +- }, +- "stylelint-config-recommended-vue": { +- "version": "1.5.0", +- "dev": true, +- "requires": { +- "semver": "^7.3.5", +- "stylelint-config-html": ">=1.0.0", +- "stylelint-config-recommended": ">=6.0.0" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "stylelint-config-standard": { +- "version": "34.0.0", +- "dev": true, +- "requires": { +- "stylelint-config-recommended": "^13.0.0" +- } +- }, +- "stylelint-scss": { +- "version": "5.3.1", +- "dev": true, +- "requires": { +- "known-css-properties": "^0.29.0", +- "postcss-media-query-parser": "^0.2.3", +- "postcss-resolve-nested-selector": "^0.1.1", +- "postcss-selector-parser": "^6.0.13", +- "postcss-value-parser": "^4.2.0" +- } +- }, +- "sumchecker": { +- "version": "3.0.1", +- "requires": { +- "debug": "^4.1.0" +- } +- }, +- "supports-color": { +- "version": "7.2.0", +- "requires": { +- "has-flag": "^4.0.0" +- } +- }, +- "supports-hyperlinks": { +- "version": "3.0.0", +- "dev": true, +- "requires": { +- "has-flag": "^4.0.0", +- "supports-color": "^7.0.0" +- } +- }, +- "supports-preserve-symlinks-flag": { +- "version": "1.0.0" +- }, +- "svg-tags": { +- "version": "1.0.0", +- "dev": true +- }, +- "table": { +- "version": "6.8.1", +- "dev": true, +- "requires": { +- "ajv": "^8.0.1", +- "lodash.truncate": "^4.4.2", +- "slice-ansi": "^4.0.0", +- "string-width": "^4.2.3", +- "strip-ansi": "^6.0.1" +- }, +- "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "dev": true, +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0", +- "dev": true +- }, +- "slice-ansi": { +- "version": "4.0.0", +- "dev": true, +- "requires": { +- "ansi-styles": "^4.0.0", +- "astral-regex": "^2.0.0", +- "is-fullwidth-code-point": "^3.0.0" +- } +- } +- } +- }, +- "tapable": { +- "version": "2.2.1" +- }, +- "tar": { +- "version": "6.2.1", +- "dev": true, +- "requires": { +- "chownr": "^2.0.0", +- "fs-minipass": "^2.0.0", +- "minipass": "^5.0.0", +- "minizlib": "^2.1.1", +- "mkdirp": "^1.0.3", +- "yallist": "^4.0.0" +- }, +- "dependencies": { +- "mkdirp": { +- "version": "1.0.4", +- "dev": true +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "tar-fs": { +- "version": "2.1.1", +- "requires": { +- "chownr": "^1.1.1", +- "mkdirp-classic": "^0.5.2", +- "pump": "^3.0.0", +- "tar-stream": "^2.1.4" +- }, +- "dependencies": { +- "chownr": { +- "version": "1.1.4" +- } +- } +- }, +- "tar-stream": { +- "version": "2.2.0", +- "requires": { +- "bl": "^4.0.3", +- "end-of-stream": "^1.4.1", +- "fs-constants": "^1.0.0", +- "inherits": "^2.0.3", +- "readable-stream": "^3.1.1" +- } +- }, +- "temp-file": { +- "version": "3.4.0", +- "dev": true, +- "requires": { +- "async-exit-hook": "^2.0.1", +- "fs-extra": "^10.0.0" +- }, +- "dependencies": { +- "fs-extra": { +- "version": "10.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^6.0.1", +- "universalify": "^2.0.0" +- } +- }, +- "jsonfile": { +- "version": "6.1.0", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.6", +- "universalify": "^2.0.0" +- } +- }, +- "universalify": { +- "version": "2.0.1", +- "dev": true +- } +- } +- }, +- "terser": { +- "version": "5.31.0", +- "requires": { +- "@jridgewell/source-map": "^0.3.3", +- "acorn": "^8.8.2", +- "commander": "^2.20.0", +- "source-map-support": "~0.5.20" +- }, +- "dependencies": { +- "acorn": { +- "version": "8.11.2" +- }, +- "commander": { +- "version": "2.20.3" +- } +- } +- }, +- "terser-webpack-plugin": { +- "version": "5.3.10", +- "requires": { +- "@jridgewell/trace-mapping": "^0.3.20", +- "jest-worker": "^27.4.5", +- "schema-utils": "^3.1.1", +- "serialize-javascript": "^6.0.1", +- "terser": "^5.26.0" +- }, +- "dependencies": { +- "schema-utils": { +- "version": "3.3.0", +- "requires": { +- "@types/json-schema": "^7.0.8", +- "ajv": "^6.12.5", +- "ajv-keywords": "^3.5.2" +- } +- } +- } +- }, +- "text-extensions": { +- "version": "1.9.0", +- "dev": true +- }, +- "text-table": { +- "version": "0.2.0", +- "dev": true +- }, +- "through": { +- "version": "2.3.8", +- "dev": true +- }, +- "through2": { +- "version": "4.0.2", +- "dev": true, +- "requires": { +- "readable-stream": "3" +- } +- }, +- "thunky": { +- "version": "1.1.0", +- "dev": true +- }, +- "tmp": { +- "version": "0.0.33", +- "dev": true, +- "requires": { +- "os-tmpdir": "~1.0.2" +- } +- }, +- "tmp-promise": { +- "version": "3.0.3", +- "dev": true, +- "requires": { +- "tmp": "^0.2.0" +- }, +- "dependencies": { +- "tmp": { +- "version": "0.2.3", +- "dev": true +- } +- } +- }, +- "to-fast-properties": { +- "version": "2.0.0" +- }, +- "to-regex-range": { +- "version": "5.0.1", +- "requires": { +- "is-number": "^7.0.0" +- } +- }, +- "toidentifier": { +- "version": "1.0.1", +- "dev": true +- }, +- "tr46": { +- "version": "0.0.3", +- "dev": true +- }, +- "tree-kill": { +- "version": "1.2.2" +- }, +- "trim-newlines": { +- "version": "3.0.1", +- "dev": true +- }, +- "truncate-utf8-bytes": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "utf8-byte-length": "^1.0.1" +- } +- }, +- "ts-loader": { +- "version": "9.2.9", +- "requires": { +- "chalk": "^4.1.0", +- "enhanced-resolve": "^5.0.0", +- "micromatch": "^4.0.0", +- "semver": "^7.3.4" +- }, +- "dependencies": { +- "lru-cache": { +- "version": "6.0.0", +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0" +- } +- } +- }, +- "ts-node": { +- "version": "10.9.1", +- "dev": true, +- "requires": { +- "@cspotcode/source-map-support": "^0.8.0", +- "@tsconfig/node10": "^1.0.7", +- "@tsconfig/node12": "^1.0.7", +- "@tsconfig/node14": "^1.0.0", +- "@tsconfig/node16": "^1.0.2", +- "acorn": "^8.4.1", +- "acorn-walk": "^8.1.1", +- "arg": "^4.1.0", +- "create-require": "^1.1.0", +- "diff": "^4.0.1", +- "make-error": "^1.1.1", +- "v8-compile-cache-lib": "^3.0.1", +- "yn": "3.1.1" +- }, +- "dependencies": { +- "acorn": { +- "version": "8.11.2", +- "dev": true +- } +- } +- }, +- "tsconfig-paths": { +- "version": "3.14.2", +- "dev": true, +- "requires": { +- "@types/json5": "^0.0.29", +- "json5": "^1.0.2", +- "minimist": "^1.2.6", +- "strip-bom": "^3.0.0" +- }, +- "dependencies": { +- "json5": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "minimist": "^1.2.0" +- } +- } +- } +- }, +- "tslib": { +- "version": "2.6.2" +- }, +- "tsutils": { +- "version": "3.21.0", +- "dev": true, +- "requires": { +- "tslib": "^1.8.1" +- }, +- "dependencies": { +- "tslib": { +- "version": "1.14.1", +- "dev": true +- } +- } +- }, +- "tunnel-agent": { +- "version": "0.6.0", +- "requires": { +- "safe-buffer": "^5.0.1" +- } +- }, +- "tweetnacl": { +- "version": "0.14.5" +- }, +- "type-check": { +- "version": "0.4.0", +- "dev": true, +- "requires": { +- "prelude-ls": "^1.2.1" +- } +- }, +- "type-fest": { +- "version": "2.19.0" +- }, +- "type-is": { +- "version": "1.6.18", +- "dev": true, +- "requires": { +- "media-typer": "0.3.0", +- "mime-types": "~2.1.24" +- } +- }, +- "typed-array-buffer": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "get-intrinsic": "^1.2.1", +- "is-typed-array": "^1.1.10" +- } +- }, +- "typed-array-byte-length": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "for-each": "^0.3.3", +- "has-proto": "^1.0.1", +- "is-typed-array": "^1.1.10" +- } +- }, +- "typed-array-byte-offset": { +- "version": "1.0.0", +- "dev": true, +- "requires": { +- "available-typed-arrays": "^1.0.5", +- "call-bind": "^1.0.2", +- "for-each": "^0.3.3", +- "has-proto": "^1.0.1", +- "is-typed-array": "^1.1.10" +- } +- }, +- "typed-array-length": { +- "version": "1.0.4", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "for-each": "^0.3.3", +- "is-typed-array": "^1.1.9" +- } +- }, +- "typedarray": { +- "version": "0.0.6", +- "dev": true +- }, +- "typescript": { +- "version": "4.6.4" +- }, +- "uglify-js": { +- "version": "3.17.4", +- "dev": true, +- "optional": true +- }, +- "unbox-primitive": { +- "version": "1.0.2", +- "dev": true, +- "requires": { +- "call-bind": "^1.0.2", +- "has-bigints": "^1.0.2", +- "has-symbols": "^1.0.3", +- "which-boxed-primitive": "^1.0.2" +- } +- }, +- "undici-types": { +- "version": "5.26.5" +- }, +- "unicode-canonical-property-names-ecmascript": { +- "version": "2.0.0", +- "dev": true +- }, +- "unicode-match-property-ecmascript": { +- "version": "2.0.0", +- "dev": true, +- "requires": { +- "unicode-canonical-property-names-ecmascript": "^2.0.0", +- "unicode-property-aliases-ecmascript": "^2.0.0" +- } +- }, +- "unicode-match-property-value-ecmascript": { +- "version": "2.1.0", +- "dev": true +- }, +- "unicode-property-aliases-ecmascript": { +- "version": "2.1.0", +- "dev": true +- }, +- "unicorn-magic": { +- "version": "0.1.0", +- "dev": true +- }, +- "universalify": { +- "version": "0.1.2" +- }, +- "unpipe": { +- "version": "1.0.0", +- "dev": true +- }, +- "unzip-crx-3": { +- "version": "0.2.0", +- "requires": { +- "jszip": "^3.1.0", +- "mkdirp": "^0.5.1", +- "yaku": "^0.16.6" +- } +- }, +- "update-browserslist-db": { +- "version": "1.0.13", +- "requires": { +- "escalade": "^3.1.1", +- "picocolors": "^1.0.0" +- } +- }, +- "uri-js": { +- "version": "4.4.1", +- "requires": { +- "punycode": "^2.1.0" +- } +- }, +- "utf8-byte-length": { +- "version": "1.0.5", +- "dev": true +- }, +- "util-deprecate": { +- "version": "1.0.2" +- }, +- "utila": { +- "version": "0.4.0" +- }, +- "utils-merge": { +- "version": "1.0.1", +- "dev": true +- }, +- "uuid": { +- "version": "8.3.2", +- "dev": true +- }, +- "v-mask": { +- "version": "2.3.0" +- }, +- "v8-compile-cache": { +- "version": "2.4.0", +- "dev": true +- }, +- "v8-compile-cache-lib": { +- "version": "3.0.1", +- "dev": true +- }, +- "validate-npm-package-license": { +- "version": "3.0.4", +- "dev": true, +- "requires": { +- "spdx-correct": "^3.0.0", +- "spdx-expression-parse": "^3.0.0" +- } +- }, +- "vary": { +- "version": "1.1.2", +- "dev": true +- }, +- "vue": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz", +- "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==", +- "requires": { +- "@vue/compiler-dom": "3.4.27", +- "@vue/compiler-sfc": "3.4.27", +- "@vue/runtime-dom": "3.4.27", +- "@vue/server-renderer": "3.4.27", +- "@vue/shared": "3.4.27" +- }, +- "dependencies": { +- "@vue/compiler-core": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz", +- "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==", +- "requires": { +- "@babel/parser": "^7.24.4", +- "@vue/shared": "3.4.27", +- "entities": "^4.5.0", +- "estree-walker": "^2.0.2", +- "source-map-js": "^1.2.0" +- } +- }, +- "@vue/compiler-dom": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz", +- "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==", +- "requires": { +- "@vue/compiler-core": "3.4.27", +- "@vue/shared": "3.4.27" +- } +- }, +- "@vue/compiler-sfc": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz", +- "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==", +- "requires": { +- "@babel/parser": "^7.24.4", +- "@vue/compiler-core": "3.4.27", +- "@vue/compiler-dom": "3.4.27", +- "@vue/compiler-ssr": "3.4.27", +- "@vue/shared": "3.4.27", +- "estree-walker": "^2.0.2", +- "magic-string": "^0.30.10", +- "postcss": "^8.4.38", +- "source-map-js": "^1.2.0" +- } +- }, +- "@vue/compiler-ssr": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz", +- "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==", +- "requires": { +- "@vue/compiler-dom": "3.4.27", +- "@vue/shared": "3.4.27" +- } +- }, +- "@vue/shared": { +- "version": "3.4.27", +- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz", +- "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" +- }, +- "magic-string": { +- "version": "0.30.10", +- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", +- "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", +- "requires": { +- "@jridgewell/sourcemap-codec": "^1.4.15" +- } +- } +- } +- }, +- "vue-eslint-parser": { +- "version": "8.3.0", +- "dev": true, +- "requires": { +- "debug": "^4.3.2", +- "eslint-scope": "^7.0.0", +- "eslint-visitor-keys": "^3.1.0", +- "espree": "^9.0.0", +- "esquery": "^1.4.0", +- "lodash": "^4.17.21", +- "semver": "^7.3.5" +- }, +- "dependencies": { +- "acorn": { +- "version": "8.11.2", +- "dev": true +- }, +- "eslint-scope": { +- "version": "7.2.2", +- "dev": true, +- "requires": { +- "esrecurse": "^4.3.0", +- "estraverse": "^5.2.0" +- } +- }, +- "eslint-visitor-keys": { +- "version": "3.4.3", +- "dev": true +- }, +- "espree": { +- "version": "9.6.1", +- "dev": true, +- "requires": { +- "acorn": "^8.9.0", +- "acorn-jsx": "^5.3.2", +- "eslint-visitor-keys": "^3.4.1" +- } +- }, +- "estraverse": { +- "version": "5.3.0", +- "dev": true +- }, +- "lru-cache": { +- "version": "6.0.0", +- "dev": true, +- "requires": { +- "yallist": "^4.0.0" +- } +- }, +- "semver": { +- "version": "7.5.4", +- "dev": true, +- "requires": { +- "lru-cache": "^6.0.0" +- } +- }, +- "yallist": { +- "version": "4.0.0", +- "dev": true +- } +- } +- }, +- "vue-i18n": { +- "version": "9.13.1", +- "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.13.1.tgz", +- "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==", +- "requires": { +- "@intlify/core-base": "9.13.1", +- "@intlify/shared": "9.13.1", +- "@vue/devtools-api": "^6.5.0" +- } +- }, +- "vue-loader": { +- "version": "16.8.3", +- "requires": { +- "chalk": "^4.1.0", +- "hash-sum": "^2.0.0", +- "loader-utils": "^2.0.0" +- } +- }, +- "vue-resize": { +- "version": "2.0.0-alpha.1", +- "requires": {} +- }, +- "vuedraggable": { +- "version": "4.1.0", +- "requires": { +- "sortablejs": "1.14.0" ++ "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, +- "watchpack": { +- "version": "2.4.1", +- "requires": { +- "glob-to-regexp": "^0.4.1", +- "graceful-fs": "^4.1.2" ++ "node_modules/webpack-cli/node_modules/get-stream": { ++ "version": "6.0.1", ++ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", ++ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "wbuf": { +- "version": "1.7.3", +- "dev": true, +- "requires": { +- "minimalistic-assert": "^1.0.0" ++ "node_modules/webpack-cli/node_modules/human-signals": { ++ "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", ++ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", ++ "license": "Apache-2.0", ++ "engines": { ++ "node": ">=10.17.0" + } + }, +- "webidl-conversions": { +- "version": "3.0.1", +- "dev": true +- }, +- "webpack": { +- "version": "5.91.0", +- "requires": { +- "@types/eslint-scope": "^3.7.3", +- "@types/estree": "^1.0.5", +- "@webassemblyjs/ast": "^1.12.1", +- "@webassemblyjs/wasm-edit": "^1.12.1", +- "@webassemblyjs/wasm-parser": "^1.12.1", +- "acorn": "^8.7.1", +- "acorn-import-assertions": "^1.9.0", +- "browserslist": "^4.21.10", +- "chrome-trace-event": "^1.0.2", +- "enhanced-resolve": "^5.16.0", +- "es-module-lexer": "^1.2.1", +- "eslint-scope": "5.1.1", +- "events": "^3.2.0", +- "glob-to-regexp": "^0.4.1", +- "graceful-fs": "^4.2.11", +- "json-parse-even-better-errors": "^2.3.1", +- "loader-runner": "^4.2.0", +- "mime-types": "^2.1.27", +- "neo-async": "^2.6.2", +- "schema-utils": "^3.2.0", +- "tapable": "^2.1.1", +- "terser-webpack-plugin": "^5.3.10", +- "watchpack": "^2.4.1", +- "webpack-sources": "^3.2.3" ++ "node_modules/webpack-cli/node_modules/is-stream": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", ++ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=8" + }, +- "dependencies": { +- "acorn": { +- "version": "8.11.2" +- }, +- "acorn-import-assertions": { +- "version": "1.9.0", +- "requires": {} +- }, +- "schema-utils": { +- "version": "3.3.0", +- "requires": { +- "@types/json-schema": "^7.0.8", +- "ajv": "^6.12.5", +- "ajv-keywords": "^3.5.2" +- } +- } ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "webpack-cli": { +- "version": "4.9.2", +- "requires": { +- "@discoveryjs/json-ext": "^0.5.0", +- "@webpack-cli/configtest": "^1.1.1", +- "@webpack-cli/info": "^1.4.1", +- "@webpack-cli/serve": "^1.6.1", +- "colorette": "^2.0.14", +- "commander": "^7.0.0", +- "execa": "^5.0.0", +- "fastest-levenshtein": "^1.0.12", +- "import-local": "^3.0.2", +- "interpret": "^2.2.0", +- "rechoir": "^0.7.0", +- "webpack-merge": "^5.7.3" +- }, ++ "node_modules/webpack-cli/node_modules/npm-run-path": { ++ "version": "4.0.1", ++ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", ++ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", ++ "license": "MIT", + "dependencies": { +- "commander": { +- "version": "7.2.0" +- } ++ "path-key": "^3.0.0" ++ }, ++ "engines": { ++ "node": ">=8" ++ } ++ }, ++ "node_modules/webpack-cli/node_modules/signal-exit": { ++ "version": "3.0.7", ++ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", ++ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", ++ "license": "ISC" ++ }, ++ "node_modules/webpack-cli/node_modules/strip-final-newline": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", ++ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=6" + } + }, +- "webpack-dev-middleware": { ++ "node_modules/webpack-dev-middleware": { + "version": "5.3.4", ++ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", ++ "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", + "dev": true, +- "requires": { ++ "license": "MIT", ++ "dependencies": { + "colorette": "^2.0.10", + "memfs": "^3.4.3", + "mime-types": "^2.1.31", + "range-parser": "^1.2.1", + "schema-utils": "^4.0.0" + }, ++ "engines": { ++ "node": ">= 12.13.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/webpack" ++ }, ++ "peerDependencies": { ++ "webpack": "^4.0.0 || ^5.0.0" ++ } ++ }, ++ "node_modules/webpack-dev-middleware/node_modules/schema-utils": { ++ "version": "4.2.0", ++ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", ++ "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", ++ "dev": true, ++ "license": "MIT", + "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "dev": true, +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "ajv-keywords": { +- "version": "5.1.0", +- "dev": true, +- "requires": { +- "fast-deep-equal": "^3.1.3" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0", +- "dev": true +- }, +- "schema-utils": { +- "version": "4.2.0", +- "dev": true, +- "requires": { +- "@types/json-schema": "^7.0.9", +- "ajv": "^8.9.0", +- "ajv-formats": "^2.1.1", +- "ajv-keywords": "^5.1.0" +- } +- } ++ "@types/json-schema": "^7.0.9", ++ "ajv": "^8.9.0", ++ "ajv-formats": "^2.1.1", ++ "ajv-keywords": "^5.1.0" ++ }, ++ "engines": { ++ "node": ">= 12.13.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/webpack" + } + }, +- "webpack-dev-server": { ++ "node_modules/webpack-dev-server": { + "version": "4.11.1", ++ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", ++ "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "dev": true, +- "requires": { ++ "license": "MIT", ++ "dependencies": { + "@types/bonjour": "^3.5.9", + "@types/connect-history-api-fallback": "^1.3.5", + "@types/express": "^4.17.13", +@@ -27076,325 +20158,557 @@ + "webpack-dev-middleware": "^5.3.1", + "ws": "^8.4.2" + }, +- "dependencies": { +- "ajv": { +- "version": "8.12.0", +- "dev": true, +- "requires": { +- "fast-deep-equal": "^3.1.1", +- "json-schema-traverse": "^1.0.0", +- "require-from-string": "^2.0.2", +- "uri-js": "^4.2.2" +- } +- }, +- "ajv-keywords": { +- "version": "5.1.0", +- "dev": true, +- "requires": { +- "fast-deep-equal": "^3.1.3" +- } +- }, +- "json-schema-traverse": { +- "version": "1.0.0", +- "dev": true +- }, +- "schema-utils": { +- "version": "4.2.0", +- "dev": true, +- "requires": { +- "@types/json-schema": "^7.0.9", +- "ajv": "^8.9.0", +- "ajv-formats": "^2.1.1", +- "ajv-keywords": "^5.1.0" +- } ++ "bin": { ++ "webpack-dev-server": "bin/webpack-dev-server.js" ++ }, ++ "engines": { ++ "node": ">= 12.13.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/webpack" ++ }, ++ "peerDependencies": { ++ "webpack": "^4.37.0 || ^5.0.0" ++ }, ++ "peerDependenciesMeta": { ++ "webpack-cli": { ++ "optional": true + } + } + }, +- "webpack-merge": { ++ "node_modules/webpack-dev-server/node_modules/schema-utils": { ++ "version": "4.2.0", ++ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", ++ "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@types/json-schema": "^7.0.9", ++ "ajv": "^8.9.0", ++ "ajv-formats": "^2.1.1", ++ "ajv-keywords": "^5.1.0" ++ }, ++ "engines": { ++ "node": ">= 12.13.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/webpack" ++ } ++ }, ++ "node_modules/webpack-merge": { + "version": "5.10.0", +- "requires": { ++ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", ++ "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", ++ "license": "MIT", ++ "dependencies": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.0" ++ }, ++ "engines": { ++ "node": ">=10.0.0" ++ } ++ }, ++ "node_modules/webpack-sources": { ++ "version": "3.2.3", ++ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", ++ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=10.13.0" ++ } ++ }, ++ "node_modules/webpack/node_modules/acorn": { ++ "version": "8.13.0", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", ++ "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", ++ "license": "MIT", ++ "bin": { ++ "acorn": "bin/acorn" ++ }, ++ "engines": { ++ "node": ">=0.4.0" ++ } ++ }, ++ "node_modules/webpack/node_modules/acorn-import-attributes": { ++ "version": "1.9.5", ++ "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", ++ "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", ++ "license": "MIT", ++ "peerDependencies": { ++ "acorn": "^8" ++ } ++ }, ++ "node_modules/webpack/node_modules/ajv": { ++ "version": "6.12.6", ++ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", ++ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", ++ "license": "MIT", ++ "dependencies": { ++ "fast-deep-equal": "^3.1.1", ++ "fast-json-stable-stringify": "^2.0.0", ++ "json-schema-traverse": "^0.4.1", ++ "uri-js": "^4.2.2" ++ }, ++ "funding": { ++ "type": "github", ++ "url": "https://github.com/sponsors/epoberezkin" ++ } ++ }, ++ "node_modules/webpack/node_modules/ajv-keywords": { ++ "version": "3.5.2", ++ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", ++ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ++ "license": "MIT", ++ "peerDependencies": { ++ "ajv": "^6.9.1" + } + }, +- "webpack-sources": { +- "version": "3.2.3" ++ "node_modules/webpack/node_modules/json-schema-traverse": { ++ "version": "0.4.1", ++ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", ++ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", ++ "license": "MIT" ++ }, ++ "node_modules/webpack/node_modules/schema-utils": { ++ "version": "3.3.0", ++ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", ++ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", ++ "license": "MIT", ++ "dependencies": { ++ "@types/json-schema": "^7.0.8", ++ "ajv": "^6.12.5", ++ "ajv-keywords": "^3.5.2" ++ }, ++ "engines": { ++ "node": ">= 10.13.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/webpack" ++ } + }, +- "websocket-driver": { ++ "node_modules/websocket-driver": { + "version": "0.7.4", ++ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", ++ "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dev": true, +- "requires": { ++ "license": "Apache-2.0", ++ "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" ++ }, ++ "engines": { ++ "node": ">=0.8.0" + } + }, +- "websocket-extensions": { ++ "node_modules/websocket-extensions": { + "version": "0.1.4", +- "dev": true ++ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", ++ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", ++ "dev": true, ++ "license": "Apache-2.0", ++ "engines": { ++ "node": ">=0.8.0" ++ } + }, +- "whatwg-url": { ++ "node_modules/whatwg-url": { + "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", ++ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, +- "requires": { ++ "license": "MIT", ++ "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, +- "which": { ++ "node_modules/which": { + "version": "2.0.2", +- "requires": { ++ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", ++ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", ++ "license": "ISC", ++ "dependencies": { + "isexe": "^2.0.0" ++ }, ++ "bin": { ++ "node-which": "bin/node-which" ++ }, ++ "engines": { ++ "node": ">= 8" + } + }, +- "which-boxed-primitive": { ++ "node_modules/which-boxed-primitive": { + "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", ++ "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, +- "requires": { ++ "license": "MIT", ++ "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" + } + }, +- "which-module": { ++ "node_modules/which-module": { + "version": "2.0.1", +- "dev": true ++ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", ++ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", ++ "dev": true, ++ "license": "ISC" + }, +- "which-typed-array": { +- "version": "1.1.13", ++ "node_modules/which-typed-array": { ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", ++ "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, +- "requires": { +- "available-typed-arrays": "^1.0.5", +- "call-bind": "^1.0.4", ++ "license": "MIT", ++ "dependencies": { ++ "available-typed-arrays": "^1.0.7", ++ "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", +- "has-tostringtag": "^1.0.0" ++ "has-tostringtag": "^1.0.2" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" + } + }, +- "wildcard": { +- "version": "2.0.1" ++ "node_modules/wildcard": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", ++ "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", ++ "license": "MIT" ++ }, ++ "node_modules/word-wrap": { ++ "version": "1.2.5", ++ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", ++ "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=0.10.0" ++ } + }, +- "wordwrap": { ++ "node_modules/wordwrap": { + "version": "1.0.0", +- "dev": true ++ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", ++ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", ++ "dev": true, ++ "license": "MIT" + }, +- "wrap-ansi": { ++ "node_modules/wrap-ansi": { + "version": "3.0.1", +- "requires": { ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", ++ "integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==", ++ "license": "MIT", ++ "dependencies": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0" + }, +- "dependencies": { +- "ansi-regex": { +- "version": "3.0.1" +- }, +- "is-fullwidth-code-point": { +- "version": "2.0.0" +- }, +- "string-width": { +- "version": "2.1.1", +- "requires": { +- "is-fullwidth-code-point": "^2.0.0", +- "strip-ansi": "^4.0.0" +- } +- }, +- "strip-ansi": { +- "version": "4.0.0", +- "requires": { +- "ansi-regex": "^3.0.0" +- } +- } ++ "engines": { ++ "node": ">=4" + } + }, +- "wrap-ansi-cjs": { +- "version": "npm:wrap-ansi@7.0.0", ++ "node_modules/wrap-ansi-cjs": { ++ "name": "wrap-ansi", ++ "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", ++ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, +- "requires": { ++ "license": "MIT", ++ "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" ++ }, ++ "engines": { ++ "node": ">=10" ++ }, ++ "funding": { ++ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" ++ } ++ }, ++ "node_modules/wrap-ansi/node_modules/ansi-regex": { ++ "version": "3.0.1", ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", ++ "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=4" ++ } ++ }, ++ "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", ++ "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=4" ++ } ++ }, ++ "node_modules/wrap-ansi/node_modules/string-width": { ++ "version": "2.1.1", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", ++ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", ++ "license": "MIT", ++ "dependencies": { ++ "is-fullwidth-code-point": "^2.0.0", ++ "strip-ansi": "^4.0.0" ++ }, ++ "engines": { ++ "node": ">=4" ++ } ++ }, ++ "node_modules/wrap-ansi/node_modules/strip-ansi": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", ++ "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", ++ "license": "MIT", ++ "dependencies": { ++ "ansi-regex": "^3.0.0" ++ }, ++ "engines": { ++ "node": ">=4" + } + }, +- "wrappy": { +- "version": "1.0.2" ++ "node_modules/wrappy": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", ++ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", ++ "license": "ISC" + }, +- "write-file-atomic": { ++ "node_modules/write-file-atomic": { + "version": "5.0.1", ++ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", ++ "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, +- "requires": { ++ "license": "ISC", ++ "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, +- "dependencies": { +- "signal-exit": { +- "version": "4.1.0", +- "dev": true +- } ++ "engines": { ++ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, +- "ws": { +- "version": "8.14.2", ++ "node_modules/ws": { ++ "version": "8.18.0", ++ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", ++ "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "dev": true, +- "requires": {} ++ "license": "MIT", ++ "engines": { ++ "node": ">=10.0.0" ++ }, ++ "peerDependencies": { ++ "bufferutil": "^4.0.1", ++ "utf-8-validate": ">=5.0.2" ++ }, ++ "peerDependenciesMeta": { ++ "bufferutil": { ++ "optional": true ++ }, ++ "utf-8-validate": { ++ "optional": true ++ } ++ } + }, +- "xmlbuilder": { ++ "node_modules/xmlbuilder": { + "version": "15.1.1", +- "dev": true ++ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", ++ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=8.0" ++ } + }, +- "xtend": { +- "version": "4.0.2" ++ "node_modules/xtend": { ++ "version": "4.0.2", ++ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", ++ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=0.4" ++ } + }, +- "xvfb-maybe": { ++ "node_modules/xvfb-maybe": { + "version": "0.2.1", ++ "resolved": "https://registry.npmjs.org/xvfb-maybe/-/xvfb-maybe-0.2.1.tgz", ++ "integrity": "sha512-9IyRz3l6Qyhl6LvnGRF5jMPB4oBEepQnuzvVAFTynP6ACLLSevqigICJ9d/+ofl29m2daeaVBChnPYUnaeJ7yA==", + "dev": true, +- "requires": { ++ "license": "MIT", ++ "dependencies": { + "debug": "^2.2.0", + "which": "^1.2.4" + }, ++ "bin": { ++ "xvfb-maybe": "src/xvfb-maybe.js" ++ } ++ }, ++ "node_modules/xvfb-maybe/node_modules/debug": { ++ "version": "2.6.9", ++ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", ++ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", ++ "dev": true, ++ "license": "MIT", + "dependencies": { +- "debug": { +- "version": "2.6.9", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "ms": { +- "version": "2.0.0", +- "dev": true +- }, +- "which": { +- "version": "1.3.1", +- "dev": true, +- "requires": { +- "isexe": "^2.0.0" +- } +- } ++ "ms": "2.0.0" + } + }, +- "y18n": { +- "version": "4.0.3", +- "dev": true ++ "node_modules/xvfb-maybe/node_modules/ms": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", ++ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/xvfb-maybe/node_modules/which": { ++ "version": "1.3.1", ++ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", ++ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", ++ "dev": true, ++ "license": "ISC", ++ "dependencies": { ++ "isexe": "^2.0.0" ++ }, ++ "bin": { ++ "which": "bin/which" ++ } ++ }, ++ "node_modules/y18n": { ++ "version": "5.0.8", ++ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", ++ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", ++ "dev": true, ++ "license": "ISC", ++ "engines": { ++ "node": ">=10" ++ } + }, +- "yaku": { +- "version": "0.16.7" ++ "node_modules/yaku": { ++ "version": "0.16.7", ++ "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.16.7.tgz", ++ "integrity": "sha512-Syu3IB3rZvKvYk7yTiyl1bo/jiEFaaStrgv1V2TIJTqYPStSMQVO8EQjg/z+DRzLq/4LIIharNT3iH1hylEIRw==", ++ "license": "MIT" + }, +- "yallist": { +- "version": "3.1.1" ++ "node_modules/yallist": { ++ "version": "3.1.1", ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", ++ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", ++ "license": "ISC" + }, +- "yargs": { +- "version": "15.4.1", ++ "node_modules/yargs": { ++ "version": "17.7.2", ++ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", ++ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, +- "requires": { +- "cliui": "^6.0.0", +- "decamelize": "^1.2.0", +- "find-up": "^4.1.0", +- "get-caller-file": "^2.0.1", ++ "license": "MIT", ++ "dependencies": { ++ "cliui": "^8.0.1", ++ "escalade": "^3.1.1", ++ "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", +- "require-main-filename": "^2.0.0", +- "set-blocking": "^2.0.0", +- "string-width": "^4.2.0", +- "which-module": "^2.0.0", +- "y18n": "^4.0.0", +- "yargs-parser": "^18.1.2" ++ "string-width": "^4.2.3", ++ "y18n": "^5.0.5", ++ "yargs-parser": "^21.1.1" + }, +- "dependencies": { +- "find-up": { +- "version": "4.1.0", +- "dev": true, +- "requires": { +- "locate-path": "^5.0.0", +- "path-exists": "^4.0.0" +- } +- }, +- "locate-path": { +- "version": "5.0.0", +- "dev": true, +- "requires": { +- "p-locate": "^4.1.0" +- } +- }, +- "p-limit": { +- "version": "2.3.0", +- "dev": true, +- "requires": { +- "p-try": "^2.0.0" +- } +- }, +- "p-locate": { +- "version": "4.1.0", +- "dev": true, +- "requires": { +- "p-limit": "^2.2.0" +- } +- }, +- "p-try": { +- "version": "2.2.0", +- "dev": true +- }, +- "path-exists": { +- "version": "4.0.0", +- "dev": true +- }, +- "yargs-parser": { +- "version": "18.1.3", +- "dev": true, +- "requires": { +- "camelcase": "^5.0.0", +- "decamelize": "^1.2.0" +- } +- } ++ "engines": { + "node": ">=12" } }, - "node_modules/yauzl": { +- "yargs-parser": { +- "version": "20.2.9", +- "dev": true ++ "node_modules/yargs-parser": { ++ "version": "21.1.1", ++ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", ++ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", ++ "dev": true, ++ "license": "ISC", ++ "engines": { ++ "node": ">=12" ++ } + }, +- "yauzl": { ++ "node_modules/yauzl": { "version": "2.10.0", -- "license": "MIT", +- "requires": { + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dependencies": { ++ "license": "MIT", ++ "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" -@@ -16850,18 +19018,20 @@ - }, - "node_modules/yn": { - "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", -+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, -- "license": "MIT", - "engines": { - "node": ">=6" } }, - "node_modules/yocto-queue": { +- "yn": { ++ "node_modules/yn": { + "version": "3.1.1", +- "dev": true ++ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", ++ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=6" ++ } + }, +- "yocto-queue": { - "version": "0.1.0", +- "dev": true ++ "node_modules/yocto-queue": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz", + "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==", - "dev": true, -- "license": "MIT", - "engines": { -- "node": ">=10" ++ "dev": true, ++ "license": "MIT", ++ "engines": { + "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -@@ -16869,8 +19039,9 @@ ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" ++ } }, - "node_modules/zip-stream": { +- "zip-stream": { ++ "node_modules/zip-stream": { "version": "4.1.1", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", "dev": true, -- "license": "MIT", ++ "license": "MIT", "peer": true, - "dependencies": { +- "requires": { ++ "dependencies": { "archiver-utils": "^3.0.4", -@@ -16883,8 +19054,9 @@ - }, - "node_modules/zip-stream/node_modules/archiver-utils": { - "version": "3.0.4", + "compress-commons": "^4.1.2", + "readable-stream": "^3.6.0" + }, ++ "engines": { ++ "node": ">= 10" ++ } ++ }, ++ "node_modules/zip-stream/node_modules/archiver-utils": { ++ "version": "3.0.4", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", - "dev": true, -- "license": "MIT", - "peer": true, ++ "dev": true, ++ "license": "MIT", ++ "peer": true, "dependencies": { - "glob": "^7.2.3", - +- "archiver-utils": { +- "version": "3.0.4", +- "dev": true, +- "peer": true, +- "requires": { +- "glob": "^7.2.3", +- "graceful-fs": "^4.2.0", +- "lazystream": "^1.0.0", +- "lodash.defaults": "^4.2.0", +- "lodash.difference": "^4.5.0", +- "lodash.flatten": "^4.4.0", +- "lodash.isplainobject": "^4.0.6", +- "lodash.union": "^4.6.0", +- "normalize-path": "^3.0.0", +- "readable-stream": "^3.6.0" +- } +- } ++ "glob": "^7.2.3", ++ "graceful-fs": "^4.2.0", ++ "lazystream": "^1.0.0", ++ "lodash.defaults": "^4.2.0", ++ "lodash.difference": "^4.5.0", ++ "lodash.flatten": "^4.4.0", ++ "lodash.isplainobject": "^4.0.6", ++ "lodash.union": "^4.6.0", ++ "normalize-path": "^3.0.0", ++ "readable-stream": "^3.6.0" ++ }, ++ "engines": { ++ "node": ">= 10" + } + } + } diff --git a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix index c433cab7eb..e5cc1e500a 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix @@ -4,29 +4,34 @@ buildNpmPackage, electron, nodejs, + makeDesktopItem, + copyDesktopItems, }: buildNpmPackage rec { pname = "antares"; - version = "0.7.28"; + version = "0.7.29"; src = fetchFromGitHub { owner = "antares-sql"; repo = "antares"; rev = "v${version}"; - hash = "sha256-nEI1G0A1c+xjALbIcItzh4CFxAeQPOD8h+Bs0aYnEfU="; + hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g="; }; - npmDepsHash = "sha256-lSkZTa2zt8BeucOih8XjQ7QW/tg34umIRe4a4DDBW34="; + npmDepsHash = "sha256-WJ5HVVa4rEOsvr52L/OGk+vlxRiKLJTxWmUnpN1FnbY="; patches = [ - # In version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package + # Since version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package # This patch will probably be removed in the next version + # If it does not build without it, you just need to do a npm update in the antares project and copy the patch ./npm-lock.patch ]; buildInputs = [ nodejs ]; + nativeBuildInputs = [ copyDesktopItems ]; + npmBuildScript = "compile"; installPhase = '' @@ -37,12 +42,30 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/antares \ --add-flags $out/lib/node_modules/antares/main.js runHook postInstall + + # Install icon files + mkdir -pv $out/share/icon/ + cp assets/icon.ico $out/share/icon/antares.ico ''; npmFlags = [ "--legacy-peer-deps" ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Antares SQL"; + exec = pname; + icon = pname; + terminal = false; + type = "Application"; + startupWMClass = pname; + comment = "A modern, fast and productivity driven SQL client with a focus in UX"; + categories = [ "Development" ]; + }) + ]; + meta = with lib; { description = "Modern, fast and productivity driven SQL client with a focus in UX"; homepage = "https://github.com/antares-sql/antares"; diff --git a/third_party/nixpkgs/pkgs/by-name/an/anyk/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anyk/package.nix index d0c6321bb6..0bb63de000 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anyk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anyk/package.nix @@ -3,6 +3,7 @@ , fetchurl , fetchzip , openjdk +, openjfx , writeScript , runCommandLocal , bash @@ -24,10 +25,16 @@ let stripRoot = false; }; - # ÁNYK uses some SOAP stuff that's not shipped with OpenJDK any more. - # We don't really want to use openjdk8 because it's unusable on HiDPI - # and people are more likely to have a modern OpenJDK installed. + # ÁNYK needs JavaFX for the Ügyfélkapu login webview. + jdkWithFX = openjdk.override { + enableJavaFX = true; + openjfx = openjfx.override { withWebKit = true; }; + }; + extraClasspath = [ + # ÁNYK uses some SOAP stuff that's not shipped with OpenJDK any more. + # We don't really want to use openjdk8 because it's unusable on HiDPI + # and people are more likely to have a modern OpenJDK installed. (fetchurl { url = "mirror://maven/org/glassfish/metro/webservices-rt/2.4.10/webservices-rt-2.4.10.jar"; hash = "sha256-lHclIZn3HR2B2lMttmmQGIV67qJi5KhL5jT2WNUQpPI="; @@ -43,7 +50,7 @@ let hash = "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE="; }) - # Patch one of the classes so it works with the packages above by removing .internal. from the package names. + # Patch one of the ÁNYK classes so it works with the packages above by removing .internal. from the package names. (runCommandLocal "anyk-patch" {} '' mkdir $out cd $out @@ -83,7 +90,7 @@ let SCALING_PROP="-Dsun.java2d.uiScale=''${WINDOW_SCALING_FACTOR}" fi # ÁNYK crashes with NullPointerException with the GTK look and feel so use the cross-platform one. - exec ${openjdk}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@" + exec ${jdkWithFX}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@" ''; in stdenv.mkDerivation { pname = "anyk"; diff --git a/third_party/nixpkgs/pkgs/by-name/ap/appimageupdate/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/appimageupdate/package.nix new file mode 100644 index 0000000000..b1af05103d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ap/appimageupdate/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + qt5, + zsync2, + libcpr, + libgcrypt, + libappimage, + argagg, + nlohmann_json, + gpgme, + appimageupdate-qt, + withQtUI ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "appimageupdate"; + version = "2.0.0-alpha-1-20230526"; + + src = fetchFromGitHub { + owner = "AppImageCommunity"; + repo = "AppImageUpdate"; + rev = finalAttrs.version; + hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \ + --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' \ + --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \ + --replace-fail '' '' + ''; + + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals withQtUI [ + qt5.wrapQtAppsHook + ]; + + buildInputs = + [ + zsync2 + libcpr + libgcrypt + libappimage + argagg + nlohmann_json + gpgme + ] + ++ lib.optionals withQtUI [ + qt5.qtbase + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_ZSYNC2" true) + (lib.cmakeBool "USE_SYSTEM_LIBAPPIMAGE" true) + (lib.cmakeBool "BUILD_QT_UI" withQtUI) + ]; + + dontWrapQtApps = true; + + preFixup = lib.optionalString withQtUI '' + wrapQtApp "$out/bin/AppImageUpdate" + ''; + + passthru.tests = { + inherit appimageupdate-qt; + }; + + meta = { + description = "Update AppImages using information embedded in the AppImage itself"; + homepage = "https://github.com/AppImageCommunity/AppImageUpdate"; + license = lib.licenses.mit; + mainProgram = if withQtUI then "AppImageUpdate" else "appimageupdatetool"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ap/application-title-bar/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/application-title-bar/package.nix index a98fda3e6b..468ab23f12 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/application-title-bar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/application-title-bar/package.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchFromGitHub -, kdePackages -, nix-update-script +{ + lib, + stdenvNoCC, + fetchFromGitHub, + kdePackages, + nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kvFUz0m222jTGrkqLyYmnW0o4MXU9lLAsyk6QBAJHr8="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-mC7aHZzrahCqLStoc5diiKXpP2LOaK5EwpFVte+qZS4="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix index 431eb04af4..ba1b532bd7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-y5mvbh/hPZdcjUbJYK9xTTuv3P7Y4VHdkKlGld1KwVs="; + hash = "sha256-VPt7NL25PqIIESOrNfiTwm/g8+gApU6Onsy18+LslxA="; }; # cycle detection; lib can't be split diff --git a/third_party/nixpkgs/pkgs/by-name/ar/archivemount/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/archivemount/package.nix new file mode 100644 index 0000000000..0a86748873 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ar/archivemount/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromSourcehut, + fetchpatch, + pkg-config, + fuse, + libarchive, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "archivemount"; + version = "1"; + + src = fetchFromSourcehut { + owner = "~nabijaczleweli"; + repo = "archivemount-ng"; + rev = finalAttrs.version; + hash = "sha256-xuLtbqC9iS86BKz4jG8of4id+GTlBXoohONrkmIzOpY="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + fuse + libarchive + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=${finalAttrs.version}" + ]; + + dontConfigure = true; + + # Fix missing standard struct stat on Darwin + # Already on upstream, but no new release made + patches = [ + (fetchpatch { + name = "fix-missing-standard-struct-stat-on-darwin.patch"; + url = "https://git.sr.ht/~nabijaczleweli/archivemount-ng/commit/53dd70f05fdb6ababe7c1ca70f0f62bcf4930b5a.patch"; + hash = "sha256-UqoALAJoNXihop6Mem4mu+W8REOV92Zyv7pPW20Ugz8="; + }) + ]; + + # Fix cross-compilation + postPatch = '' + substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG" + ''; + + meta = { + description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; + mainProgram = "archivemount"; + license = [ + lib.licenses.lgpl2Plus + lib.licenses.bsd0 + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix index 6181d49d4b..854fcaecce 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "art"; - version = "1.23"; + version = "1.24.1"; src = fetchFromBitbucket { owner = "agriggio"; repo = "art"; rev = version; - hash = "sha256-OB/Rr4rHNJc40o6esNPDRbhN4EPGf2zhlzzM+mBpUUU="; + hash = "sha256-uvdqU509ri6CKCEGA8Ln5tMp0pe3r/bcJefbeZGjocE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix index 33d0b5aedc..a979dafd8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.15.0"; + version = "2.15.3"; src = fetchFromGitHub { owner = "withastro"; repo = "language-tools"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-2MaoW04mX016VIrtfnBX/jzMNCOXE10lSInSyhqot5E="; + hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo="; }; pnpmDeps = pnpm.fetchDeps { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspace prePnpmInstall ; - hash = "sha256-zCCDlwsKPZQVEYrv85WcMY2JlWgz0tD6iHLSJg1RkRU="; + hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/at/atlas/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atlas/package.nix index d19454e84c..22250150de 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atlas/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atlas/package.nix @@ -1,14 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + atlas, +}: buildGoModule rec { pname = "atlas"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-D6dHHTxD2eObmXwYntIOtcPsU1vP+K289n+XVoaGUVc="; + hash = "sha256-OPGPYCp878nYYujR1jiMpOg1cdLSwa3OZEIxL6JltD4="; }; modRoot = "cmd/atlas"; @@ -18,7 +25,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" + ]; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json index 4320f1380e..0699cd2dde 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json +++ b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "80e0cac4747e61d1fbb5374ec4ac41d3499042e2", - "hash": "sha256-gwu9AvxrfW1QSgUy3Q4di1xa964ZMZpRkgdFQlit9+4=", - "version": "2.15.0", - "depsHash": "sha256-TDZUrzVcmKn4izRn8E+uf6Mh22fRsHeVm5h+wRZAX8o=", - "clientDepsHash": "sha256-7R5+Yam9Y4+bj/8wrAE25g4sivg/sw5G0pAZFGPRpMI=" + "rev": "d80752cc9d7ace01fee57a627b7745adedc08589", + "hash": "sha256-iT2Ww+iRyGS5qBT3QcM7weiYq/6c408jTSPuZinNXgs=", + "version": "2.15.1", + "depsHash": "sha256-km/cx2IaJ2/1UxZk2uXHE46VF3MiR6hasYRuKKBitY4=", + "clientDepsHash": "sha256-3XsXCZrDMtZFs8xwqydfVouAuxarQl/KdMdHkq+Vp9A=" } diff --git a/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix b/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix index 2447355540..3a87f2ac0c 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/share/applications mkdir $out/share/pixmaps cp scripts/auto-cpufreq-gtk.desktop $out/share/applications - cp images/icon.png $out/share/pixmaps/auto-cpufreq.python3Packages + cp images/icon.png $out/share/pixmaps/auto-cpufreq.png # polkit policy mkdir -p $out/share/polkit-1/actions diff --git a/third_party/nixpkgs/pkgs/by-name/au/autoprefixer/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autoprefixer/package.nix index b9f036ee0c..b1977eba41 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/autoprefixer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/autoprefixer/package.nix @@ -24,7 +24,7 @@ pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-AKOcKly8uBohhxx9nSo8rMrm0Ebk06LHZ1Yt9yoZj7g="; + hash = "sha256-Gu2DRDx0YRlSb+EInOfmAOYKvOba6Lq1wkOW9t9fnbA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/aw/await/package.nix b/third_party/nixpkgs/pkgs/by-name/aw/await/package.nix index 56726df19e..8369cd6015 100644 --- a/third_party/nixpkgs/pkgs/by-name/aw/await/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aw/await/package.nix @@ -3,17 +3,18 @@ stdenv, fetchFromGitHub, installShellFiles, + versionCheckHook, }: stdenv.mkDerivation rec { pname = "await"; - version = "1.0.2"; + version = "1.0.5"; src = fetchFromGitHub { owner = "slavaGanzin"; repo = "await"; rev = "v${version}"; - hash = "sha256-qvSRuRLZnUptXYknyRn4GgmYtj9BnI8flN6EhadbKMw="; + hash = "sha256-0U9eLQDvHnRUJt46AI4bDWZfGynqjaWs9teidWP3RsA="; }; nativeBuildInputs = [ installShellFiles ]; @@ -30,11 +31,16 @@ stdenv.mkDerivation rec { install -Dm755 await -t $out/bin install -Dm444 LICENSE -t $out/share/licenses/await install -Dm444 README.md -t $out/share/doc/await - installShellCompletion --cmd await autocomplete.{bash,fish,zsh} + installShellCompletion --cmd await autocompletions/await.{bash,fish,zsh} runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { description = "Small binary that runs a list of commands in parallel and awaits termination"; homepage = "https://await-cli.app"; diff --git a/third_party/nixpkgs/pkgs/by-name/aw/awscli2/package.nix b/third_party/nixpkgs/pkgs/by-name/aw/awscli2/package.nix index e24c5e30c7..0a9958e92d 100644 --- a/third_party/nixpkgs/pkgs/by-name/aw/awscli2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aw/awscli2/package.nix @@ -141,6 +141,12 @@ py.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index bf1bf61c73..6018719f2c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: { '' # Uses pkg_get_variable, cannot substitute prefix with that substituteInPlace data/CMakeLists.txt \ - --replace "\''${SYSTEMD_USER_DIR}" "$out/lib/systemd/user" + --replace-fail "\''${SYSTEMD_USER_DIR}" "$out/lib/systemd/user" # Bad concatenation substituteInPlace libmessaging-menu/messaging-menu.pc.in \ - --replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \ - --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' + --replace-fail "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' # Fix tests with gobject-introspection 1.80 not installing GLib introspection data substituteInPlace tests/CMakeLists.txt \ diff --git a/third_party/nixpkgs/pkgs/by-name/ba/basalt-monado/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/basalt-monado/package.nix new file mode 100644 index 0000000000..cc031c9aa7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/basalt-monado/package.nix @@ -0,0 +1,78 @@ +{ + autoPatchelfHook, + boost, + bzip2, + cereal, + cmake, + eigen, + extra-cmake-modules, + fetchFromGitLab, + fmt, + freeglut, + glew, + lib, + libepoxy, + libGL, + lz4, + magic-enum, + nix-update-script, + opencv, + pkg-config, + stdenv, + tbb, + xorg, +}: +stdenv.mkDerivation { + pname = "basalt-monado"; + version = "0-unstable-2024-06-21"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mateosss"; + repo = "basalt"; + rev = "385c161f35720df3a6c606054565f9d49a1c5787"; + hash = "sha256-+2/pc2OWDwE04xPcfHL5GGyhQ1ZTN6o7cCNAilDgd2Y="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + boost + bzip2 + cereal + eigen + fmt + freeglut + glew + libepoxy + libGL + lz4 + magic-enum + opencv + tbb + xorg.libX11 + ]; + + cmakeFlags = [ + (lib.cmakeBool "BASALT_INSTANTIATIONS_DOUBLE" false) + (lib.cmakeBool "BUILD_TESTS" false) + (lib.cmakeFeature "EIGEN_ROOT" "${eigen}/include/eigen3") + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A fork of Basalt improved for tracking XR devices with Monado"; + homepage = "https://gitlab.freedesktop.org/mateosss/basalt"; + license = lib.licenses.bsd3; + mainProgram = "basalt_vio"; + maintainers = [ lib.maintainers.locochoco ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix index 4b045a8fde..2778d255ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix @@ -45,13 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm --offline \ --frozen-lockfile --ignore-script \ --filter=bash-language-server \ - deploy $out/lib/bash-language-server - # Cleanup directory a bit, to save space, and make fixup phase a bit faster - rm -r $out/lib/bash-language-server/src - find $out/lib/bash-language-server -name '*.ts' -delete - rm -r \ - $out/lib/bash-language-server/node_modules/.bin \ - $out/lib/bash-language-server/node_modules/*/bin + deploy --prod $out/lib/bash-language-server # Create the executable, based upon what happens in npmHooks.npmInstallHook makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \ diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix index 7561af663e..343aa8da91 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.1"; + version = "1.5.2"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-Vnbyq6NVJ/QtDqXT6IY/sjqsWqxs34C+ibebbx8Vp4E="; + hash = "sha256-Eq66tuRP/+TPLNDQRox8/dMT/7fGGrxmUUML8wJ3v+M="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/third_party/nixpkgs/pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch b/third_party/nixpkgs/pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch new file mode 100644 index 0000000000..041ab7246e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1ecfe0..9056f9d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,8 +83,9 @@ ExternalProject_Add(BearSource + -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS} + -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} + ${CMAKE_CACHE_ARGS_EXTRA} +- TEST_BEFORE_INSTALL ++ TEST_EXCLUDE_FROM_MAIN + 1 ++ STEP_TARGETS test + TEST_COMMAND + ctest # or `ctest -T memcheck` + ) +@@ -100,7 +101,8 @@ if (ENABLE_FUNC_TESTS) + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} + -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} +- TEST_BEFORE_INSTALL ++ TEST_EXCLUDE_FROM_MAIN ++ STEP_TARGETS test + 1 + INSTALL_COMMAND + "" diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bear/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix rename to third_party/nixpkgs/pkgs/by-name/be/bear/package.nix index 489181187c..01d7560b93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/bear/package.nix @@ -6,7 +6,7 @@ ninja, pkg-config, grpc, - protobuf_25, + protobuf, openssl, nlohmann_json, gtest, @@ -20,33 +20,28 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bear"; - version = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = "rizsotto"; - repo = pname; - rev = version; - hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0="; + repo = "bear"; + rev = finalAttrs.version; + hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c="; }; nativeBuildInputs = [ cmake ninja pkg-config - - # Used for functional tests, which run during buildPhase. - lit - python3 ]; buildInputs = [ grpc - protobuf_25 + protobuf openssl nlohmann_json - gtest spdlog c-ares zlib @@ -54,20 +49,52 @@ stdenv.mkDerivation rec { re2 ]; + patches = [ + # This patch is necessary to run tests in a separate phase. By default + # test targets are run with ALL, which is not what we want. This patch creates + # separate 'test' step targets for each cmake ExternalProject: + # - BearTest-test (functional lit tests) + # - BearSource-test (unit tests via gtest) + ./0001-exclude-tests-from-all.patch + ]; + + nativeCheckInputs = [ + lit + python3 + ]; + + checkInputs = [ + gtest + ]; + cmakeFlags = [ # Build system and generated files concatenate install prefix and # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" - (lib.cmakeBool "ENABLE_UNIT_TESTS" false) - (lib.cmakeBool "ENABLE_FUNC_TESTS" false) + (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.doCheck) ]; - patches = [ - # Fix toolchain environment variable handling and the Darwin SIP check. - ./fix-functional-tests.patch + checkTarget = lib.concatStringsSep " " [ + "BearTest-test" + "BearSource-test" ]; + doCheck = true; + + env = { + # Disable failing tests. The cause is not immediately clear. + LIT_FILTER_OUT = lib.concatStringsSep "|" [ + "cases/compilation/output/config/filter_compilers.sh" + "cases/intercept/preload/posix/execvpe/success_to_resolve.c" + "cases/intercept/preload/posix/popen/success.c" + "cases/intercept/preload/posix/posix_spawnp/success_to_resolve.c" + "cases/intercept/preload/posix/system/success.c" + "cases/intercept/preload/shell_commands_intercepted_without_shebang.sh" + ]; + }; + postPatch = '' patchShebangs test/bin @@ -92,4 +119,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ DieracDelta ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix index b5a1b55036..02d29d61ee 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix @@ -1,26 +1,38 @@ { lib, + darwin, rustPlatform, fetchFromGitHub, stdenv, }: rustPlatform.buildRustPackage rec { pname = "binsider"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = "binsider"; rev = "v${version}"; - hash = "sha256-+QgbSpiDKPTVdSm0teEab1O6OJZKEDpC2ZIZ728e69Y="; + hash = "sha256-VnWLslelEAXuSy7XnxrdgSkXqTrd+Ni7lQFsB2P+ILs="; }; - cargoHash = "sha256-lXYTZ3nvLrfEgo7AY/qSQYpXsyrdJuQQw43xREezNn0="; + cargoHash = "sha256-eBZ7zUOucarzdxTjHecUxGqUsKTQPaaotOfs/v0MxHk="; - # Tests need the executable in target/debug/ - preCheck = '' - cargo build - ''; + buildNoDefaultFeatures = !stdenv.isLinux; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreServices + ] + ); + + checkType = "debug"; + checkFlags = [ + "--skip=test_extract_strings" + "--skip=test_init" + ]; meta = with lib; { description = "Analyzer of executables using a terminal user interface"; @@ -31,6 +43,5 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ samueltardieu ]; mainProgram = "binsider"; - broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitcomet/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitcomet/package.nix new file mode 100644 index 0000000000..8b249d403b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitcomet/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchurl, + appimageTools, + webkitgtk_4_0, +}: +let + pname = "bitcomet"; + version = "2.10.0"; + src = fetchurl { + url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; + hash = "sha256-HC9kThRuDcc7oWXuMeWe9g6P/v6GZQ8ho5sc4bNzsYw="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = + pkgs: with pkgs; [ + libxml2 + libpng + webkitgtk_4_0 + ]; + + extraInstallCommands = '' + mkdir -p $out/share/applications + install -m 444 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop + substituteInPlace $out/share/applications/bitcomet.desktop \ + --replace-fail 'Exec=usr/bin/BitComet' 'Exec=bitcomet' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = { + homepage = "https://www.bitcomet.com"; + description = "Free BitTorrent download client"; + mainProgram = "bitcomet"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ aucub ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix index dfeb7b31e8..565d530488 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix @@ -1,10 +1,10 @@ { lib -, buildGoModule +, buildGo122Module # builds, but does not start on 1.23 , fetchFromGitHub , nix-update-script }: -buildGoModule rec { +buildGo122Module rec { pname = "bitmagnet"; version = "0.9.5"; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/blueprint-compiler/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blueprint-compiler/package.nix index 95903e2e76..e426503c54 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; + hash = "sha256-pkbTxCN7LagIbOtpiUCkh40aHw6uRtalQVFa47waXjU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/third_party/nixpkgs/pkgs/by-name/bl/bluespec/libstp_stub_makefile.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch rename to third_party/nixpkgs/pkgs/by-name/bl/bluespec/libstp_stub_makefile.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluespec/package.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix rename to third_party/nixpkgs/pkgs/by-name/bl/bluespec/package.nix index e761c8609e..720dbe8474 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluespec/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "bluespec"; - version = "2024.01"; + version = "2024.07"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; rev = version; - sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE="; + sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0="; }; yices-src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bustools/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bustools/package.nix new file mode 100644 index 0000000000..2ed9fb52ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bu/bustools/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + testers, + bustools, +}: + +stdenv.mkDerivation rec { + pname = "bustools"; + version = "0.44.1"; + + src = fetchFromGitHub { + owner = "BUStools"; + repo = "bustools"; + rev = "v${version}"; + sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + passthru.tests.version = testers.testVersion { + package = bustools; + command = "bustools version"; + }; + + meta = { + description = "bustools is a program for manipulating BUS files for single cell RNA-Seq datasets"; + longDescription = '' + bustools is a program for manipulating BUS files for single cell RNA-Seq datasets. It can be used to error correct barcodes, collapse UMIs, produce gene count or transcript compatibility count matrices, and is useful for many other tasks. It is also part of the kallisto | bustools workflow for pre-processing single-cell RNA-seq data. + ''; + homepage = "https://www.kallistobus.tools/"; + downloadPage = "https://bustools.github.io/download"; + changelog = "https://github.com/BUStools/bustools/releases/tag/v${version}"; + maintainers = [ lib.maintainers.dflores ]; + license = lib.licenses.bsd2; + mainProgram = "bustools"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cabal-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cabal-cli/package.nix new file mode 100644 index 0000000000..11cb241ad1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cabal-cli/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +let + version = "15.0.2"; + pname = "cabal-cli"; +in +buildNpmPackage { + inherit version pname; + + src = fetchFromGitHub { + owner = "cabal-club"; + repo = "cabal-cli"; + rev = "v${version}"; + hash = "sha256-DZ+F+pgPc8WuiBhLgxNO5es5lA996fJdvZyg6QjfrHg="; + }; + + npmDepsHash = "sha256-Oqyx6pytDrYg1JbHawKxnnWEJxaFUaM9LcREizh3LFQ="; + + dontNpmBuild = true; + + env.NODE_OPTIONS = "--openssl-legacy-provider"; + + meta = { + description = "Terminal client for Cabal, the p2p chat platform"; + homepage = "https://cabal.chat"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ kototama ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/third_party/nixpkgs/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch rename to third_party/nixpkgs/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calibre/package.nix similarity index 78% rename from third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/calibre/package.nix index b5e8c469b4..d0b604fd2f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/calibre/package.nix @@ -1,43 +1,43 @@ -{ lib -, stdenv -, fetchurl -, cmake -, fetchpatch -, fontconfig -, hunspell -, hyphen -, icu -, imagemagick -, libjpeg -, libmtp -, libpng -, libstemmer -, libuchardet -, libusb1 -, pkg-config -, podofo -, poppler_utils -, python3Packages -, qmake -, qtbase -, qtwayland -, speechd-minimal -, sqlite -, wrapQtAppsHook -, xdg-utils -, wrapGAppsHook3 -, popplerSupport ? true -, speechSupport ? true -, unrarSupport ? false +{ + lib, + stdenv, + fetchurl, + cmake, + fetchpatch, + ffmpeg, + fontconfig, + hunspell, + hyphen, + icu, + imagemagick, + libjpeg, + libmtp, + libpng, + libstemmer, + libuchardet, + libusb1, + piper-tts, + pkg-config, + podofo, + poppler_utils, + python3Packages, + qt6, + speechd-minimal, + sqlite, + xdg-utils, + wrapGAppsHook3, + popplerSupport ? true, + speechSupport ? true, + unrarSupport ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.16.0"; + version = "7.20.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-EWQfaoTwO9BdZQgJQrxfj6b8tmtukvlW5hFo/USjNhU="; + hash = "sha256-BhJEJsQKk/kJxycm/1mbtlrSaeFQPvWGGB9DUMidgII="; }; patches = [ @@ -50,10 +50,9 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-a6yyG0RUsQJBBNxeJsTtQSBV2lxdzz1hnTob88O+SKg="; + hash = "sha256-8tOxFCmZal+JxOz6LeuUr+TgX7IaxC9Ow73bMgFJPt8="; }) - ] - ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ @@ -69,12 +68,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - qmake + qt6.qmake + qt6.wrapQtAppsHook wrapGAppsHook3 - wrapQtAppsHook ]; buildInputs = [ + ffmpeg fontconfig hunspell hyphen @@ -86,13 +86,16 @@ stdenv.mkDerivation (finalAttrs: { libstemmer libuchardet libusb1 + piper-tts podofo poppler_utils - qtbase - qtwayland + qt6.qtbase + qt6.qtwayland sqlite - (python3Packages.python.withPackages - (ps: with ps; [ + (python3Packages.python.withPackages ( + ps: + with ps; + [ (apsw.overrideAttrs (oldAttrs: { setupPyBuildFlags = [ "--enable=load_extension" ]; })) @@ -124,13 +127,17 @@ stdenv.mkDerivation (finalAttrs: { xxhash # the following are distributed with calibre, but we use upstream instead odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] ++ lib.optional (unrarSupport) unrardll) - ) + ] + ++ + lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) + [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] + ++ lib.optional (unrarSupport) unrardll + )) xdg-utils ] ++ lib.optional (speechSupport) speechd-minimal; @@ -148,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: { export PODOFO_LIB_DIR=${podofo.lib}/lib export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" + export PIPER_TTS_DIR=${piper-tts}/bin python setup.py install --root=$out \ --prefix=$out \ @@ -219,9 +227,7 @@ stdenv.mkDerivation (finalAttrs: { free and open source and great for both casual users and computer experts. ''; changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}"; - license = if unrarSupport - then lib.licenses.unfreeRedistributable - else lib.licenses.gpl3Plus; + license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix index bffa712245..cb0b084ebf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.90"; + version = "1.0.91"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-8Ls7Wklb5cnYo6acmGtjTHV1ZhSPVEQ9BsbR78a2LG0="; + hash = "sha256-ucxqC5OqBqmM9+jKnGWLd9g2GDAXjAqSl+0ouhs6evA="; }; - cargoHash = "sha256-8IKKK0xBgl5FiEoPrwO1uL/S+fOLv4Rof8KjquHJ6DI="; + cargoHash = "sha256-vDYpFJ+RFjouXgZc+ESPpkXA4sv5eHVZc93s+3KJj2g="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-hakari/package.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-hakari/package.nix index c8429896be..ba5c2e9997 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-hakari/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.30"; + version = "0.9.33"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw="; + sha256 = "sha256-oJZiGXsOl00Bim/olYYSqt/p3j6dTw25IURcwdXYrAo="; }; - cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY="; + cargoHash = "sha256-V9QmaZYBXj26HJrP8gABwhhUPwBxnyLoO4O45lnPyew="; cargoBuildFlags = [ "-p" @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { "cargo-hakari" ]; - meta = with lib; { + meta = { description = "Manage workspace-hack packages to speed up builds in large workspaces"; mainProgram = "cargo-hakari"; longDescription = '' @@ -36,13 +36,14 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://crates.io/crates/cargo-hakari"; changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda macalinao + nartsiss ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-cursors/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-cursors/package.nix index 604b04e50e..95531507df 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -15,7 +15,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "0.3.1"; + version = "0.4.0"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10="; + hash = "sha256-VxLwZkZdV1xH4jeqtszqSnhNrgF3uamEXBLPKIc4lXE="; }; nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 4d578abdd9..a24ba42938 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform }: -let version = "2.5.0"; +let version = "2.5.1"; in rustPlatform.buildRustPackage { pname = "catppuccin-whiskers"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "catppuccin"; repo = "whiskers"; rev = "refs/tags/v${version}"; - hash = "sha256-HsHBMJPSoDhSNwjAR7LbFG4Za4H2H+7itqgiKRdb4M8="; + hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4="; }; - cargoHash = "sha256-FpBgXP4kXSzrYP+ad+KubUG4NSDpyoaJwyReS86ETy8="; + cargoHash = "sha256-5FvW+ioeDi0kofDswyQpUC21wbEZM8TAeUEUemnNfnA="; meta = { homepage = "https://github.com/catppuccin/whiskers"; diff --git a/third_party/nixpkgs/pkgs/by-name/ch/charmcraft/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/charmcraft/package.nix index 80c245f746..dca969004e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/charmcraft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; rev = "refs/tags/${version}"; - hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls="; + hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix index bb8a4d98bd..adc180a4c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix @@ -1,19 +1,18 @@ -{ lib -, fetchFromGitHub -, stdenv -, cmake -, pkg-config -, installShellFiles -, libclang -, clang -, llvmPackages -, libllvm -, yaml-cpp -, elfutils -, libunwind -, enableLibcxx ? false -, debug ? false -, +{ + lib, + fetchFromGitHub, + stdenv, + cmake, + pkg-config, + installShellFiles, + libclang, + llvmPackages, + libllvm, + yaml-cpp, + elfutils, + libunwind, + enableLibcxx ? false, + debug ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "clang-uml"; @@ -26,17 +25,27 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-YzHlauVuFLT2PmfqJBNwqQ/P7d7tyl3brk7Vo/kTOF4="; }; - nativeBuildInputs = [ - cmake - pkg-config - installShellFiles - ] ++ (if debug then [ - elfutils - libunwind - ] else [ ]); + nativeBuildInputs = + [ + cmake + pkg-config + installShellFiles + ] + ++ ( + if debug then + [ + elfutils + libunwind + ] + else + [ ] + ); + + cmakeFlags = [ + "-DCUSTOM_COMPILE_OPTIONS=-Wno-error=sign-compare" + ]; buildInputs = [ - clang libclang libllvm yaml-cpp @@ -63,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = debug; dontStrip = debug; - meta = with lib; { + meta = { description = "Customizable automatic UML diagram generator for C++ based on Clang"; longDescription = '' clang-uml is an automatic C++ to UML class, sequence, package and include diagram generator, driven by YAML configuration files. @@ -71,9 +80,9 @@ stdenv.mkDerivation (finalAttrs: { The configuration file or files for clang-uml define the types and contents of each generated diagram. The diagrams can be generated in PlantUML, MermaidJS and JSON formats. ''; - maintainers = with maintainers; [ eymeric ]; + maintainers = with lib.maintainers; [ eymeric ]; homepage = "https://clang-uml.github.io/"; - license = licenses.asl20; - platforms = platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/webui.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/webui.nix index c35dca01a3..792fbc5be8 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "${pname}-webui"; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-DYsx1X1yXYEPFuMlvZtbJdefcCR8/wSUidFwsMy8oLk="; + hash = "sha256-ZKDhBdVyLIPf7CQaYUvj9dJd3lA3zsqroSjTyvOmunQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/co/connman/create-libppp-compat.h.patch b/third_party/nixpkgs/pkgs/by-name/co/connman/create-libppp-compat.h.patch deleted file mode 100644 index dde8a174ca..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/co/connman/create-libppp-compat.h.patch +++ /dev/null @@ -1,132 +0,0 @@ -new file mode 100644 -index 000000000..eee1d09d6 ---- /dev/null -+++ b/scripts/libppp-compat.h -@@ -0,0 +1,127 @@ -+/* Copyright (C) Eivind Naess, eivnaes@yahoo.com */ -+/* SPDX-License-Identifier: GPL-2.0-or-later */ -+ -+#ifndef __LIBPPP_COMPAT_H__ -+#define __LIBPPP_COMPAT_H__ -+ -+/* Define USE_EAPTLS compile with EAP TLS support against older pppd headers, -+ * pppd >= 2.5.0 use PPP_WITH_EAPTLS and is defined in pppdconf.h */ -+#define USE_EAPTLS 1 -+ -+/* Define INET6 to compile with IPv6 support against older pppd headers, -+ * pppd >= 2.5.0 use PPP_WITH_IPV6CP and is defined in pppdconf.h */ -+#define INET6 1 -+ -+/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. -+ * this silly macro magic is to work around that. */ -+#undef VERSION -+#include -+ -+#ifndef PPPD_VERSION -+#define PPPD_VERSION VERSION -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef HAVE_PPPD_CHAP_H -+#include -+#endif -+ -+#ifdef HAVE_PPPD_CHAP_NEW_H -+#include -+#endif -+ -+#ifdef HAVE_PPPD_CHAP_MS_H -+#include -+#endif -+ -+#ifndef PPP_PROTO_CHAP -+#define PPP_PROTO_CHAP 0xc223 -+#endif -+ -+#ifndef PPP_PROTO_EAP -+#define PPP_PROTO_EAP 0xc227 -+#endif -+ -+ -+#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) -+ -+static inline bool -+debug_on (void) -+{ -+ return debug; -+} -+ -+static inline const char -+*ppp_ipparam (void) -+{ -+ return ipparam; -+} -+ -+static inline int -+ppp_ifunit (void) -+{ -+ return ifunit; -+} -+ -+static inline const char * -+ppp_ifname (void) -+{ -+ return ifname; -+} -+ -+static inline int -+ppp_get_mtu (int idx) -+{ -+ return netif_get_mtu(idx); -+} -+ -+typedef enum ppp_notify -+{ -+ NF_PID_CHANGE, -+ NF_PHASE_CHANGE, -+ NF_EXIT, -+ NF_SIGNALED, -+ NF_IP_UP, -+ NF_IP_DOWN, -+ NF_IPV6_UP, -+ NF_IPV6_DOWN, -+ NF_AUTH_UP, -+ NF_LINK_DOWN, -+ NF_FORK, -+ NF_MAX_NOTIFY -+} ppp_notify_t; -+ -+typedef void (ppp_notify_fn) (void *ctx, int arg); -+ -+static inline void -+ppp_add_notify (ppp_notify_t type, ppp_notify_fn *func, void *ctx) -+{ -+ struct notifier **list[NF_MAX_NOTIFY] = { -+ [NF_PID_CHANGE ] = &pidchange, -+ [NF_PHASE_CHANGE] = &phasechange, -+ [NF_EXIT ] = &exitnotify, -+ [NF_SIGNALED ] = &sigreceived, -+ [NF_IP_UP ] = &ip_up_notifier, -+ [NF_IP_DOWN ] = &ip_down_notifier, -+ [NF_IPV6_UP ] = &ipv6_up_notifier, -+ [NF_IPV6_DOWN ] = &ipv6_down_notifier, -+ [NF_AUTH_UP ] = &auth_up_notifier, -+ [NF_LINK_DOWN ] = &link_down_notifier, -+ [NF_FORK ] = &fork_notifier, -+ }; -+ -+ struct notifier **notify = list[type]; -+ if (notify) { -+ add_notifier(notify, func, ctx); -+ } -+} -+ -+#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */ -+#endif /* #if__LIBPPP_COMPAT_H__ */ diff --git a/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix b/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix index b7906fd72c..17c54f8906 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix @@ -62,18 +62,14 @@ assert lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftable assert lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; stdenv.mkDerivation (finalAttrs: { pname = "connman"; - version = "1.42"; + version = "1.43"; src = fetchurl { url = "mirror://kernel/linux/network/connman/connman-${finalAttrs.version}.tar.xz"; - hash = "sha256-o+a65G/Age8una48qk92Sd6JLD3mIsICg6wMqBQjwqo="; + hash = "sha256-ElfOvjJ+eQC34rhMD7MwqpCBXkVYmM0vlB9DCO0r47w="; }; - patches = [ - # simply the middle section of upstream commit a48864a2e5d2a725dfc6eef567108bc13b43857f - # dist tarball is broken, hence this patch as a workaround - ./create-libppp-compat.h.patch - ] ++ optionals stdenv.hostPlatform.isMusl [ + patches = optionals stdenv.hostPlatform.isMusl [ # Fix Musl build by avoiding a Glibc-only API. (fetchurl { url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; diff --git a/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix b/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix index 26df96462c..47f1cfb73e 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix @@ -1,23 +1,24 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "containerlab"; - version = "0.57.5"; + version = "0.58.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-mMxC+Oe+O89PU3dgAbJvcHJ9ZQs1vmfF3B8w27JBPv4="; + hash = "sha256-yToqJnL2T9qTGCl1MgUkg/JSWV/kEibF59lk85tAX44="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-L/6t5vHhUog684YEOg9WYvAKCtad1MmDmasqtdwSyio="; + vendorHash = "sha256-Qg6mFd5+Crsn2Xx4yg930Iueo0vfxkzrIHO4vrNFTNc="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package-lock.json b/third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package-lock.json new file mode 100644 index 0000000000..deb2875f6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package-lock.json @@ -0,0 +1,16 @@ +{ + "name": "copilot-node-server", + "version": "1.41.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "copilot-node-server", + "version": "1.41.0", + "license": "GitHub Terms of Service", + "bin": { + "copilot-node-server": "copilot/dist/language-server.js" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package.nix b/third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package.nix new file mode 100644 index 0000000000..9dac4e8016 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/copilot-node-server/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "copilot-node-server"; + version = "1.41.0"; + + src = fetchFromGitHub { + owner = "jfcherng"; + repo = "copilot-node-server"; + rev = "v${version}"; + hash = "sha256-yOqA2Xo4c7u0g6RQYt9joQk8mI9KE0xTAnLjln9atmg="; + }; + + npmDepsHash = "sha256-tbcNRQBbJjN1N5ENxCvPQbfteyxTbPpi35dYmeUc4A4="; + + postPatch = '' + # Upstream doesn't provide any lock file so we provide our own: + cp ${./package-lock.json} package-lock.json + ''; + + preInstall = '' + # `npmInstallHook` requires a `node_modules/` folder but `npm + # install` doesn't generate one because the project has no + # dependencies: + mkdir node_modules/ + ''; + + forceEmptyCache = true; + dontNpmBuild = true; + + meta = with lib; { + description = "Copilot Node.js server"; + homepage = src.meta.homepage; + license = licenses.unfree; # I don't know: https://github.com/jfcherng/copilot-node-server/blob/main/LICENSE.md + maintainers = with maintainers; [ DamienCassou ]; + mainProgram = "copilot-node-server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-wallpapers/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-wallpapers/package.nix new file mode 100644 index 0000000000..d98223acbb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchpatch, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cosmic-wallpapers"; + version = "1.0.0-alpha.2"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-wallpapers"; + rev = "epoch-${finalAttrs.version}"; + forceFetchGit = true; + fetchLFS = true; + hash = "sha256-9abkb9dECE7qVq547DkpIUvaYLXLGfkRlTgLCbQtSPw="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/pop-os/cosmic-wallpapers/pull/2/commits/4d17ebe69335f8ffa80fd1c48baa7f3d3efa4dbe.patch"; + hash = "sha256-4QRtX5dbN6C/ZKU3pvV7mTT7EDrMWvRCFB4004RMylM="; + }) + ]; + + makeFlags = [ "prefix=$(out)" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "epoch-(.*)" + ]; + }; + + meta = { + description = "Wallpapers for the COSMIC Desktop Environment"; + homepage = "https://system76.com/cosmic"; + license = with lib.licenses; [ + unfree # https://github.com/pop-os/cosmic-wallpapers/issues/1 https://github.com/pop-os/cosmic-wallpapers/issues/3 + cc-by-40 # https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery (A_stormy_stellar_nursery_esa_379309.jpg) + publicDomain # https://earthobservatory.nasa.gov/image-use-policy (otherworldly_earth_nasa_ISS064-E-29444.jpg, phytoplankton_bloom_nasa_oli2_20240121.jpg); https://hubblesite.org/copyright (orion_nebula_nasa_heic0601a.jpg); https://webbtelescope.org/copyright (tarantula_nebula_nasa_PIA23646.jpg); https://www.planetary.org/space-images/the-solar-systems-round-moons (round_moons_nasa.jpg) + ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/co/couchbase-shell/package.nix b/third_party/nixpkgs/pkgs/by-name/co/couchbase-shell/package.nix new file mode 100644 index 0000000000..1b610b641b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/couchbase-shell/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + testers, + nix-update-script, + couchbase-shell, +}: + +rustPlatform.buildRustPackage rec { + pname = "couchbase-shell"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "couchbaselabs"; + repo = "couchbase-shell"; + rev = "v${version}"; + hash = "sha256-ksAyi7yMz56de1lA2LYVNdsn02GNrcJVoRLcK1zFppE="; + }; + + cargoHash = "sha256-efy1M4Q9dBfEq0YYUKn4y1Rz/dPbBYLapcPXJLI9X+Q="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + # tests need couchbase server + doCheck = false; + + passthru = { + tests.version = testers.testVersion { + package = couchbase-shell; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Shell for Couchbase Server and Cloud"; + homepage = "https://couchbase.sh/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ petrkozorezov ]; + mainProgram = "cbsh"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix index eb1eda130e..7012a40ea5 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix @@ -68,7 +68,9 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; - passthru.tests = [ nixosTests.crabfit ]; + passthru.tests = { + inherit (nixosTests) crabfit; + }; meta = { description = "Enter your availability to find a time that works for everyone"; diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix index f6f3bc8a8c..ff97835abc 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix @@ -107,7 +107,9 @@ stdenv.mkDerivation (finalAttrs: { ln -s /var/cache/crabfit $out/standalone/.next/cache ''; - passthru.tests = [ nixosTests.crabfit ]; + passthru.tests = { + inherit (nixosTests) crabfit; + }; meta = { description = "Enter your availability to find a time that works for everyone"; diff --git a/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix index d260a0b8de..e8d562d10c 100644 --- a/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "csvlens"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; rev = "refs/tags/v${version}"; - hash = "sha256-1tFdsSaX6xWG3DuUfbkeHJKO73mUDZcGmGCaGn4Kx24="; + hash = "sha256-q4d3BE11LVAwA16+VEWLbZW/+pkbQ5/rp+pIAiuFTyg="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - cargoHash = "sha256-rJ9InGfz4HS7Rt8c214LYaIuO2BWAx4UwLBPyTo9GZY="; + cargoHash = "sha256-eKREGxIBjzI3viieOnRRUAf+4zqKLi24Hn1aOFns8IQ="; meta = with lib; { description = "Command line csv viewer"; diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hl3170cdw/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hl3170cdw/package.nix new file mode 100644 index 0000000000..5450997a5a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hl3170cdw/package.nix @@ -0,0 +1,111 @@ +{lib, stdenv, fetchurl, dpkg, makeWrapper, gnused, coreutils, psutils, gnugrep, ghostscript, file, a2ps, gawk, which, pkgsi686Linux }: + +stdenv.mkDerivation rec { + pname = "cups-brother-${model}"; + version = "1.1.4-0"; + lprVersion = "1.1.2-1"; + + model = "hl3170cdw"; + cupsFileNo = "006743"; + lprFileNo = "007056"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf${cupsFileNo}/${model}_cupswrapper_GPL_source_${version}.tar.gz"; + hash = "sha256-E3GSwiMRkuiCIJYkDozoYUPfOqvopPqPPQt1uaMDEAU="; + }; + + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf${lprFileNo}/${model}lpr-${lprVersion}.i386.deb"; + hash = "sha256-N1GjQHth5k4qhbfWLInzub9DcNsee4gKc3EW2WIfrko="; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + preUnpack = '' + dpkg-deb -x ${lprdeb} $out + ''; + + prePatch = '' + substituteInPlace brcupsconfig/brcups_commands.h \ + --replace-fail "brprintconf[30]=\"" "brprintconf[130]=\"$out/usr/bin/" + + substituteInPlace brcupsconfig/brcupsconfig.c \ + --replace-fail "exec[300]" "exec[400]" + ''; + + makeFlags = [ "-C brcupsconfig" ]; + + installPhase = '' + runHook preInstall + + # cups install + dir=$out/opt/brother/Printers/${model} + + # Extract the true brother_lpdwrapper_MODEL filter embedded in cupswrapperMODEL by + # slicing out the relevant parts for the writing the embedded file, then running that. + sed -n -e '/tmp_filter=/c\tmp_filter=lpdwrapper' -e ' 1,/device_model=/p ; /< lpdwrapperbuilder + sh lpdwrapperbuilder + chmod +x lpdwrapper + mkdir -p $out/lib/cups/filter + cp lpdwrapper $out/lib/cups/filter/brother_lpdwrapper_${model} + + mkdir -p $out/share/cups/model/Brother + cp PPD/brother_${model}_printer_en.ppd $out/share/cups/model/Brother/brother_${model}_printer_en.ppd + + mkdir -p $dir/cupswrapper/ + cp brcupsconfig/brcupsconfpt1 $dir/cupswrapper/ + + runHook postInstall + ''; + + preFixup = '' + # lpr fixup + interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 + + substituteInPlace $dir/lpd/filter${model} \ + --replace-fail /opt "$out/opt" + substituteInPlace $dir/inf/setupPrintcapij \ + --replace-fail /opt "$out/opt" \ + --replace-fail printcap.local printcap + + wrapProgram $dir/lpd/filter${model} \ + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + wrapProgram $dir/inf/setupPrintcapij \ + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused ] } + + wrapProgram $dir/lpd/psconvertij2 \ + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript gnused coreutils gawk which ] } + + patchelf --set-interpreter "$interpreter" "$dir/lpd/br${model}filter" + patchelf --set-interpreter "$interpreter" "$out/usr/bin/brprintconf_${model}" + + wrapProgram $dir/lpd/br${model}filter \ + --set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/opt=$out/opt" + + wrapProgram $out/usr/bin/brprintconf_${model} \ + --set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/opt=$out/opt" + + # cups fixup + substituteInPlace $out/lib/cups/filter/brother_lpdwrapper_${model} \ + --replace-fail /opt/brother/Printers/${model} "$dir" \ + --replace-fail /usr/bin/psnup "${psutils}/bin/psnup" \ + --replace-fail /usr/share/cups/model/Brother "$out/share/cups/model/Brother" + + wrapProgram $out/lib/cups/filter/brother_lpdwrapper_${model} \ + --prefix PATH ":" ${ lib.makeBinPath [ coreutils psutils gnused gnugrep ] } + ''; + + meta = with lib; { + homepage = "https://www.brother.com/"; + description = "Brother ${model} printer driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode fromSource ]; + license = with licenses; [ unfree gpl2Plus ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=${model}_all&os=128"; + maintainers = with maintainers; [ luna_1024 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cy/cyrus-imapd/package.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyrus-imapd/package.nix new file mode 100644 index 0000000000..860eaf1620 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -0,0 +1,204 @@ +{ + # build tools + stdenv, + autoreconfHook, + makeWrapper, + pkg-config, + + # check hook + versionCheckHook, + + # fetchers + fetchFromGitHub, + fetchpatch, + fetchurl, + + # build inputs + bison, + brotli, + coreutils, + cunit, + cyrus_sasl, + fig2dev, + flex, + icu, + jansson, + lib, + libbsd, + libcap, + libchardet, + libical, + libmysqlclient, + libsrs2, + libuuid, + libxml2, + nghttp2, + openssl, + pcre2, + perl, + postgresql, + rsync, + shapelib, + sqlite, + unixtools, + valgrind, + wslay, + xapian, + zlib, + + # feature flags + enableAutoCreate ? true, + enableBackup ? true, + enableCalalarmd ? true, + enableHttp ? true, + enableIdled ? true, + enableJMAP ? true, + enableMurder ? true, + enableNNTP ? false, + enableReplication ? true, + enableSrs ? true, + enableUnitTests ? true, + enableXapian ? true, + withLibcap ? true, + withMySQL ? false, + withOpenssl ? true, + withPgSQL ? false, + withSQLite ? true, + withZlib ? true, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "cyrus-imapd"; + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "cyrusimap"; + repo = "cyrus-imapd"; + rev = "refs/tags/cyrus-imapd-${finalAttrs.version}"; + hash = "sha256-dyybRqmrVX+ERGpToS5JjGC6S/B0t967dLCWfeUrLKA="; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + autoreconfHook + ]; + buildInputs = + [ + unixtools.xxd + pcre2 + flex + valgrind + fig2dev + perl + cyrus_sasl.dev + icu + jansson + libbsd + libuuid + openssl + zlib + bison + libsrs2 + ] + ++ lib.optionals stdenv.isLinux [ libcap ] + ++ lib.optionals (enableHttp || enableCalalarmd || enableJMAP) [ + brotli.dev + libical.dev + libxml2.dev + nghttp2.dev + shapelib + ] + ++ lib.optionals enableJMAP [ + libchardet + wslay + ] + ++ lib.optionals enableXapian [ + rsync + xapian + ] + ++ lib.optionals withMySQL [ libmysqlclient ] + ++ lib.optionals withPgSQL [ postgresql ] + ++ lib.optionals withSQLite [ sqlite ]; + + enableParallelBuilding = true; + + postPatch = + let + managesieveLibs = + [ + zlib + cyrus_sasl + ] + # Darwin doesn't have libuuid, try to build without it + ++ lib.optional (!stdenv.isDarwin) libuuid; + imapLibs = managesieveLibs ++ [ pcre2 ]; + mkLibsString = lib.strings.concatMapStringsSep " " (l: "-L${lib.getLib l}/lib"); + in + '' + patchShebangs cunit/*.pl + patchShebangs imap/promdatagen + patchShebangs tools/* + + echo ${finalAttrs.version} > VERSION + + substituteInPlace cunit/command.testc \ + --replace-fail /usr/bin/touch ${lib.getExe' coreutils "touch"} \ + --replace-fail /bin/echo ${lib.getExe' coreutils "echo"} \ + --replace-fail /usr/bin/tr ${lib.getExe' coreutils "tr"} \ + --replace-fail /bin/sh ${stdenv.shell} + + # fix for https://github.com/cyrusimap/cyrus-imapd/issues/3893 + substituteInPlace perl/imap/Makefile.PL.in \ + --replace-fail '"$LIB_SASL' '"${mkLibsString imapLibs} -lpcre2-posix $LIB_SASL' + substituteInPlace perl/sieve/managesieve/Makefile.PL.in \ + --replace-fail '"$LIB_SASL' '"${mkLibsString managesieveLibs} $LIB_SASL' + ''; + + postFixup = '' + wrapProgram $out/bin/cyradm --set PERL5LIB $(find $out/lib/perl5 -type d | tr "\\n" ":") + ''; + + configureFlags = [ + "--with-pidfile=/run/cyrus/master.pid" + (lib.enableFeature enableAutoCreate "autocreate") + (lib.enableFeature enableSrs "srs") + (lib.enableFeature enableIdled "idled") + (lib.enableFeature enableMurder "murder") + (lib.enableFeature enableBackup "backup") + (lib.enableFeature enableReplication "replication") + (lib.enableFeature enableUnitTests "unit-tests") + (lib.enableFeature (enableHttp || enableCalalarmd || enableJMAP) "http") + (lib.enableFeature enableJMAP "jmap") + (lib.enableFeature enableNNTP "nntp") + (lib.enableFeature enableXapian "xapian") + (lib.enableFeature enableCalalarmd "calalarmd") + (lib.withFeature withZlib "zlib=${zlib}") + (lib.withFeature withOpenssl "openssl") + (lib.withFeature withLibcap "libcap=${libcap}") + (lib.withFeature withMySQL "mysql") + (lib.withFeature withPgSQL "pgsql") + (lib.withFeature withSQLite "sqlite") + ]; + + checkInputs = [ cunit ]; + doCheck = true; + + versionCheckProgram = "${builtins.placeholder "out"}/libexec/master"; + versionCheckProgramArg = "-V"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + homepage = "https://www.cyrusimap.org"; + description = "Email, contacts and calendar server"; + license = with lib.licenses; [ bsdOriginal ]; + mainProgram = "cyrus"; + maintainers = with lib.maintainers; [ + moraxyc + pingiun + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/da/dataexplorer/package.nix b/third_party/nixpkgs/pkgs/by-name/da/dataexplorer/package.nix index 4ee2b0a0e8..09406b6b3b 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/dataexplorer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/dataexplorer/package.nix @@ -4,11 +4,12 @@ , ant # executable fails to start for jdk > 17 , jdk17 +, swt , makeWrapper , strip-nondeterminism -}: - -stdenv.mkDerivation (finalAttrs: { +}: let + swt-jdk17 = swt.override { jdk = jdk17; }; +in stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; version = "3.9.0"; @@ -40,12 +41,15 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall ant -Dprefix=$out/share/ -f build/build.xml install + # Use SWT from nixpkgs + ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \ + --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix index d8f5a5362c..ef29c8a675 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix @@ -9,7 +9,6 @@ autoPatchelfHook, wrapGAppsHook3, gtk3, - swt, glib, webkitgtk_4_0, glib-networking, @@ -65,11 +64,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : "${openjdk17}/bin" \ --set JAVA_HOME "${openjdk17.home}" \ - --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix LD_LIBRARY_PATH : "$out/lib:${ lib.makeLibraryPath [ - swt gtk3 glib webkitgtk_4_0 diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbip-asn-lite/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbip-asn-lite/package.nix new file mode 100644 index 0000000000..8d844d3972 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "dbip-asn-lite"; + version = "2024-10"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-zfBRxZ6xwIrOC6MrmtbfKrIK7jxMD/1EMOgQDON6nPw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-asn-lite.mmdb + install -Dm444 dbip-asn-lite.mmdb "$out/share/dbip/dbip-asn-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-asn-lite.mmdb"; + + meta = { + description = "Free IP to ASN Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-asn-lite"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbip-city-lite/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbip-city-lite/package.nix new file mode 100644 index 0000000000..b0e3e4260c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/db/dbip-city-lite/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "dbip-city-lite"; + version = "2024-10"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-sPjtO0WRdMxGiTySFO3vA1mL3RHxDnhLFzQ1fq2LNUw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-city-lite.mmdb + install -Dm444 dbip-city-lite.mmdb "$out/share/dbip/dbip-city-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-city-lite.mmdb"; + + meta = { + description = "Free IP to City Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-city-lite"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbip-country-lite/package.nix similarity index 80% rename from third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix rename to third_party/nixpkgs/pkgs/by-name/db/dbip-country-lite/package.nix index cda4a19d26..74f9ce9770 100644 --- a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbip-country-lite/package.nix @@ -1,8 +1,8 @@ -{ lib -, stdenvNoCC -, fetchurl +{ + lib, + stdenvNoCC, + fetchurl, }: - stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; version = "2024-10"; @@ -25,11 +25,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb"; - meta = with lib; { + meta = { description = "Free IP to Country Lite database by DB-IP"; homepage = "https://db-ip.com/db/download/ip-to-country-lite"; - license = licenses.cc-by-40; - maintainers = with maintainers; [ nickcao ]; - platforms = platforms.all; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ nickcao ]; + platforms = lib.platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix index efb9cdcf79..a69da614b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; rev = "refs/tags/v${version}"; - hash = "sha256-3PfAjn2zWgxJOYgKwR7lvXu+rIENIHBMPwMM6dWNgR4="; + hash = "sha256-nbwLkkO1ucRmlgGDRCJLHPpu4lk0xLQvz3wWpq7rics="; }; - cargoHash = "sha256-3r5B9yWXKO/8ah+Etflws8RnlRTAdaaC5HZMlZduyHE="; + cargoHash = "sha256-y/hAEu8c/CFS4mfp4f/pvPJRz4cxGoi39uIUbn5J+Pw="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix index 64f45f5c06..ae33be7833 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix @@ -3,6 +3,7 @@ buildNpmPackage, fetchFromGitHub, jre_headless, + protobuf, cyclonedx-cli, makeWrapper, maven, @@ -10,7 +11,7 @@ nixosTests, }: let - version = "4.11.7"; + version = "4.12.0"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; @@ -20,10 +21,10 @@ let owner = "DependencyTrack"; repo = "frontend"; rev = version; - hash = "sha256-hgBDzzG90gunnlZeektzdBIdatNjbkDVmNLbxjyxAXE="; + hash = "sha256-7omFxT3WBQp6xftgU6ttGgwIGbLXLetQz2ySvsgsQic="; }; - npmDepsHash = "sha256-veyt7fn4g/eh/+2CapQxlEssZP8cQXONpI6sSW299tk="; + npmDepsHash = "sha256-LZg3n1+L6tvfC0gBKf8YZd/UMDz04v1V9qrJZrAr4W4="; forceGitDeps = true; makeCacheWritable = true; @@ -40,7 +41,7 @@ maven.buildMavenPackage rec { owner = "DependencyTrack"; repo = "dependency-track"; rev = version; - hash = "sha256-BMkn9WnUGs4RxH5I1QQ2UDrlo32JcbfjfFcOG5YogLI="; + hash = "sha256-FJ4VNDpmVBXU1/URb/Rnu0LXAbxKw6Zd7MPbN4bs9eY="; }; patches = [ @@ -48,8 +49,14 @@ maven.buildMavenPackage rec { ./0001-add-junixsocket.patch ]; + postPatch = '' + substituteInPlace pom.xml \ + --replace-fail '''${tool.protoc.version}' \ + "${protobuf}/bin/protoc" + ''; + mvnJdk = jre_headless; - mvnHash = "sha256-c/JwBiKsXuWbCm1dTCrVc+V/1G7Eii1mUW8xDyewyLs="; + mvnHash = "sha256-YrlGVJ0Hp9VHfMD0+hT/9q8tskft6RvszmU4tRAXSAY="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; buildOffline = true; diff --git a/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix b/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix index a6909bbde8..03afc5e200 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix @@ -2,24 +2,27 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "desed"; - version = "1.2.1-unstable-2024-09-06"; + version = "1.2.2"; src = fetchFromGitHub { owner = "SoptikHa2"; repo = "desed"; - rev = "master"; - hash = "sha256-iCpEfefXXognk4YI1LLb3mwgaqMw4m3haq/gdS1JbQU="; + rev = "refs/tags/v${version}"; + hash = "sha256-FL9w+XdClLBCRp+cLqDzTVj8j9LMUp8jZ6hiG4KvIds="; }; - cargoHash = "sha256-z2qv394C0GhQC21HuLyvlNjrM65KFEZh1XLj+Y/B9ZM="; + cargoHash = "sha256-inH8fUpUR0WXYY2JX72evZqVp3GlnGKBBlrbai/fU6U="; + + passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/SoptikHa2/desed/releases/tag/v1.2.1"; - description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal. "; + changelog = "https://github.com/SoptikHa2/desed/releases/tag/v${version}"; + description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal"; homepage = "https://github.com/SoptikHa2/desed"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ vinylen ]; diff --git a/third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch b/third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch new file mode 100644 index 0000000000..4d4744d4d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch @@ -0,0 +1,44 @@ +diff --git a/XOptions/xoptions.cpp b/XOptions/xoptions.cpp +index ca5723e..30574a5 100755 +--- a/XOptions/xoptions.cpp ++++ b/XOptions/xoptions.cpp +@@ -1531,14 +1531,7 @@ bool XOptions::checkNative(const QString &sIniFileName) + #if defined(Q_OS_MAC) + bResult = true; + #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) +- QString sApplicationDirPath = qApp->applicationDirPath(); +- +- if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || +- (sApplicationDirPath.contains("/usr/local/bin$")) || isAppImage()) { +- bResult = true; +- } else { +- bResult = false; +- } ++ bResult = true; + #elif defined(Q_OS_WIN) + QString sApplicationDirPath = qApp->applicationDirPath(); + +@@ -1565,22 +1558,7 @@ QString XOptions::getApplicationDataPath() + #ifdef Q_OS_MAC + sResult = sApplicationDirPath + "/../Resources"; + #elif defined(Q_OS_LINUX) +- if (isNative()) { +- if (sApplicationDirPath.contains("/usr/local/bin$")) { +- QString sPrefix = sApplicationDirPath.section("/usr/local/bin", 0, 0); +- +- sResult += sPrefix + QString("/usr/local/lib/%1").arg(qApp->applicationName()); +- } else { +- if (sApplicationDirPath.contains("/tmp/.mount_")) // AppImage +- { +- sResult = sApplicationDirPath.section("/", 0, 2); +- } +- +- sResult += QString("/usr/lib/%1").arg(qApp->applicationName()); +- } +- } else { +- sResult = sApplicationDirPath; +- } ++ sResult = sApplicationDirPath + "/../lib/die"; + #elif defined(Q_OS_FREEBSD) + sResult = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).at(1) + QDir::separator() + qApp->applicationName(); + #else diff --git a/third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/package.nix b/third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/package.nix new file mode 100644 index 0000000000..855095c3f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/detect-it-easy/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, + freetype, + graphite2, + icu, + krb5, + systemdLibs, + imagemagick, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "detect-it-easy"; + version = "3.09"; + + src = fetchFromGitHub { + owner = "horsicq"; + repo = "DIE-engine"; + rev = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-A9YZBlGf3j+uSefPiDhrS1Qtu6vaLm4Yodt7BioGD2Q="; + }; + + patches = [ ./0001-remove-hard-coded-paths-in-xoptions.patch ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtsvg + graphite2 + freetype + icu + krb5 + systemdLibs + ]; + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + libsForQt5.qmake + imagemagick + ]; + + enableParallelBuilding = true; + + # work around wrongly created dirs in `install.sh` + # https://github.com/horsicq/DIE-engine/issues/110 + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/applications + mkdir -p $out/share/icons + ''; + + # clean up wrongly created dirs in `install.sh` and broken .desktop file + postInstall = '' + rm -r $out/lib/{bin,share} + grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop + ''; + + meta = { + description = "Program for determining types of files for Windows, Linux and MacOS."; + mainProgram = "die"; + homepage = "https://github.com/horsicq/Detect-It-Easy"; + maintainers = with lib.maintainers; [ ivyfanchiang ]; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.mit; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix b/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix index 663668f9bf..e8a7f90ad9 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix @@ -1,5 +1,5 @@ { lib -, python311 +, python3 , fetchPypi , wrapGAppsHook3 , gtk3 @@ -8,16 +8,15 @@ , argyllcms }: -# wxPython-4.2.1 requires python < 3.12 -python311.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.12"; + version = "3.9.14"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-0NZ+fr3ilnyWE6+Xa8xqpccNe7WVvvQfQEYvdQ8rf/Q="; + hash = "sha256-2I5fiWgS9n7IY/ZayWBvEaP0uNIAXfvkyqQe2vLFPJw="; }; nativeBuildInputs = [ @@ -25,7 +24,7 @@ python311.pkgs.buildPythonApplication rec { gtk3 ]; - propagatedBuildInputs = with python311.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ build certifi wxpython diff --git a/third_party/nixpkgs/pkgs/by-name/dn/dnsdiag/package.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsdiag/package.nix new file mode 100644 index 0000000000..013d7a7525 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/dn/dnsdiag/package.nix @@ -0,0 +1,40 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dnsdiag"; + version = "2.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "farrokhi"; + repo = "dnsdiag"; + rev = "refs/tags/v${version}"; + hash = "sha256-qUbHwbLPDyy24GNu3dDJQKV3B71q1ODNMyRFIWwyRuo="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + cryptography + cymruwhois + dnspython + h2 + httpx + ]; + + # Project has no tests + doCheck = false; + + meta = { + description = "DNS Measurement, Troubleshooting and Security Auditing Toolset"; + homepage = "https://github.com/farrokhi/dnsdiag"; + changelog = "https://github.com/farrokhi/dnsdiag/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "dnsdiag"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/dn/dnslookup/package.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnslookup/package.nix new file mode 100644 index 0000000000..8491c0597a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/dn/dnslookup/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "dnslookup"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "ameshkov"; + repo = "dnslookup"; + rev = "refs/tags/v${version}"; + hash = "sha256-zgEW4ANIlwF0f6YqTQicGhGgLc9RaL7Xy0wg/ICzOK4="; + }; + + vendorHash = "sha256-pdnKYsXBw/IjakUyQym4thnO3gXgvwNm80Ha8AUVt54="; + + meta = { + changelog = "https://github.com/ameshkov/dnslookup/releases/tag/v${version}"; + description = "Simple command line utility to make DNS lookups to the specified server"; + homepage = "https://github.com/ameshkov/dnslookup"; + license = lib.licenses.mit; + mainProgram = "dnslookup"; + maintainers = [ lib.maintainers.philiptaron ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/du/dut/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dut/package.nix new file mode 100644 index 0000000000..9557adfbe5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/du/dut/package.nix @@ -0,0 +1,33 @@ +{ + stdenv, + lib, + fetchFromGitea, +}: + +stdenv.mkDerivation { + pname = "dut"; + version = "0-unstable-2024-07-31"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "201984"; + repo = "dut"; + rev = "041c6f26162c2286776fac246ddbda312da1563d"; + hash = "sha256-YrBV5rG9rASI/5pwG3kcHoOvXBHhLJHvFFrvNhmGq2Y="; + }; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = { + platforms = lib.platforms.all; + broken = stdenv.isDarwin; + description = "A disk usage calculator for Linux"; + homepage = "https://codeberg.org/201984/dut"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ errnoh ]; + mainProgram = "dut"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/eduke32/convert-bmp-to-png.diff b/third_party/nixpkgs/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff similarity index 100% rename from third_party/nixpkgs/pkgs/games/eduke32/convert-bmp-to-png.diff rename to third_party/nixpkgs/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff diff --git a/third_party/nixpkgs/pkgs/by-name/ed/eduke32/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/eduke32/package.nix new file mode 100644 index 0000000000..673e38d058 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ed/eduke32/package.nix @@ -0,0 +1,195 @@ +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + pkg-config, + nasm, + makeDesktopItem, + copyDesktopItems, + alsa-lib, + flac, + gtk2, + libvorbis, + libvpx, + libGL, + SDL2, + SDL2_mixer, + darwin, + graphicsmagick, +}: + +let + inherit (darwin.apple_sdk.frameworks) + AGL + Cocoa + GLUT + OpenGL + ; + wrapper = "eduke32-wrapper"; + swWrapper = "voidsw-wrapper"; + furyWrapper = "fury-wrapper"; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "eduke32"; + version = "0-unstable-2024-07-26"; + + src = fetchFromGitLab { + domain = "voidpoint.io"; + owner = "terminx"; + repo = "eduke32"; + rev = "19c21b9ab10b0c17147c9ad951cc15279ed33f77"; + hash = "sha256-lwnx2tVjbHouB0vaT7Dh1Ozea8+7Az6e4Wn6HmxDxCo="; + }; + + patches = [ + # gdk-pixbuf-csource no longer supports bmp so convert to png + # patch GNUMakefile to use graphicsmagick to convert bmp -> png + ./convert-bmp-to-png.diff + ]; + + buildInputs = + [ + flac + libvorbis + libvpx + SDL2 + SDL2_mixer + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + gtk2 + libGL + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AGL + Cocoa + GLUT + OpenGL + ]; + + nativeBuildInputs = + [ + makeWrapper + pkg-config + copyDesktopItems + graphicsmagick + ] + ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ + nasm + ]; + + postPatch = + '' + substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \ + --replace-fail '#include ' '#include ' \ + --replace-fail '#include ' '#include ' \ + --replace-fail '#include ' '#include ' + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + for f in glad.c glad_wgl.c ; do + substituteInPlace source/glad/src/$f \ + --replace-fail libGL.so ${libGL}/lib/libGL.so + done + ''; + + makeFlags = [ + "SDLCONFIG=${SDL2}/bin/sdl2-config" + # git rev-list --count HEAD + "VC_REV=10593" + "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}" + "VC_BRANCH=master" + ]; + + buildFlags = [ + "duke3d" + "sw" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "eduke32"; + icon = "eduke32"; + exec = "${wrapper}"; + comment = "Duke Nukem 3D port"; + desktopName = "Enhanced Duke Nukem 3D"; + genericName = "Duke Nukem 3D port"; + categories = [ "Game" ]; + }) + (makeDesktopItem { + name = "voidsw"; + icon = "voidsw"; + exec = "${swWrapper}"; + comment = "Shadow Warrior eduke32 source port"; + desktopName = "VoidSW"; + genericName = "Shadow Warrior source port"; + categories = [ "Game" ]; + }) + (makeDesktopItem { + name = "fury"; + icon = "fury"; + exec = "${furyWrapper}"; + comment = "Ion Fury eduke32 source port"; + desktopName = "Ion Fury"; + genericName = "Ion Fury source port"; + categories = [ "Game" ]; + }) + ]; + + enableParallelBuilding = true; + + installPhase = + '' + runHook preInstall + + install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \ + --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ + --add-flags '-j"$EDUKE32_DATA_DIR"' \ + --add-flags '-gamegrp DUKE3D.GRP' + makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \ + --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ + --add-flags '-j"$EDUKE32_DATA_DIR"' + makeWrapper $out/bin/eduke32 $out/bin/${furyWrapper} \ + --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ + --add-flags '-j"$EDUKE32_DATA_DIR"' \ + --add-flags '-gamegrp FURY.GRP' + mkdir -p $out/share/icons/hicolor/scalable/apps + gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png + install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg + gm convert "./source/duke3d/rsrc/fury/game_icon.ico[4]" $out/share/icons/hicolor/scalable/apps/fury.png + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications/EDuke32.app/Contents/MacOS + mkdir -p $out/Applications/Mapster32.app/Contents/MacOS + mkdir -p $out/Applications/VoidSW.app/Contents/MacOS + mkdir -p $out/Applications/Wangulator.app/Contents/MacOS + + cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/ + cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/ + cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/ + cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/ + + ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32 + ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32 + ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw + ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator + '' + + '' + runHook postInstall + ''; + + meta = { + description = "Enhanched port of Duke Nukem 3D for various platforms"; + homepage = "http://eduke32.com"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ + qubitnano + sander + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix b/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix index 4122de8675..646b18a5c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.191.0"; + version = "0.193.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-ypHBvaCvQ1FZiQmKTkQ5h024pLBOpISZooSkIDa1OeQ="; + hash = "sha256-Le/RDF4vhHmCdzuOJaIehqWYnfGH1tHAlSCjwgHXMiE="; }; vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4="; diff --git a/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix b/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix index 71b2de6659..31bd99b51b 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix @@ -37,7 +37,7 @@ buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-hjSioKpvrGyo5UKvBrwln0S3aIpnJZ2PUdzBfbT7IC4="; + hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/en/envision/package.nix b/third_party/nixpkgs/pkgs/by-name/en/envision/package.nix index 1136b959d7..223d81992b 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envision/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/envision/package.nix @@ -1,4 +1,7 @@ -{ buildFHSEnv, envision-unwrapped }: +{ + buildFHSEnv, + envision-unwrapped, +}: buildFHSEnv { name = "envision"; @@ -7,6 +10,7 @@ buildFHSEnv { strictDeps = true; + # TODO: I'm pretty suspicious of this list of additonal required dependencies. Are they all really needed? targetPkgs = pkgs: [ pkgs.envision-unwrapped ] @@ -20,7 +24,7 @@ buildFHSEnv { ) ++ ( # OpenComposite dependencies - pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost ] + pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost186 ] ) ++ ( # Monado dependencies @@ -36,6 +40,17 @@ buildFHSEnv { xorg.libXrandr xorg.libXrender xorg.xorgproto + # Additional dependencies required for Monado WMR support + bc + fmt + fmt.dev + git-lfs + gtest + jq + libepoxy + lz4.dev + tbb + libxkbcommon ]) ) ) diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch b/third_party/nixpkgs/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch index 9e58599e59..983408cab1 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch @@ -1,7 +1,7 @@ -From 07af89ac82e0c5876590f89284795bffa4b0e1c8 Mon Sep 17 00:00:00 2001 +From 47406ebaf0260e5b66a92baac3717936c8386b69 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:52:59 +0200 -Subject: [PATCH 1/3] nixpkgs: use system Python +Subject: [PATCH] nixpkgs: use system Python Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- @@ -10,13 +10,13 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl -index b015e851c0..53a2c93c59 100644 +index 9f2b336b1a..53a2c93c59 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,28 +1,25 @@ load("@com_google_protobuf//bazel:system_python.bzl", "system_python") -load("@envoy_toolshed//:packages.bzl", "load_packages") --load("@python3_11//:defs.bzl", "interpreter") +-load("@python3_12//:defs.bzl", "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") def envoy_python_dependencies(): @@ -47,13 +47,13 @@ index b015e851c0..53a2c93c59 100644 extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl -index 7fd1dc4095..001de36a16 100644 +index b92dd461ba..cef32b3140 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") - load("@com_github_rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains") + load("@bazel_features//:deps.bzl", "bazel_features_deps") load("@emsdk//:deps.bzl", emsdk_deps = "deps") - load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") + load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories") -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") +load("@rules_python//python:repositories.bzl", "py_repositories") load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") @@ -62,17 +62,17 @@ index 7fd1dc4095..001de36a16 100644 - return "_".join(python_version.split(".")[:-1]) - -# Python version for `rules_python` --PYTHON_VERSION = "3.11.9" +-PYTHON_VERSION = "3.12.3" -PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION) - # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). def envoy_dependencies_extra( - python_version = PYTHON_VERSION, ignore_root_user_error = False): + bazel_features_deps() emsdk_deps() - raze_fetch_remote_crates() @@ -22,11 +14,4 @@ def envoy_dependencies_extra( - rules_proto_grpc_toolchains() + crate_repositories() py_repositories() - # Registers underscored Python minor version - eg `python3_10` @@ -83,6 +83,3 @@ index 7fd1dc4095..001de36a16 100644 - ) - aspect_bazel_lib_dependencies() --- -2.45.1 - diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch b/third_party/nixpkgs/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch index bc48b48f73..0e42864dad 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch @@ -1,41 +1,23 @@ -From 06b51e6a0c14e5ad7cfc1dc801561e6e6e1b2014 Mon Sep 17 00:00:00 2001 +From 4be181e96199529a36e9a93c837af7173c827493 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:58:00 +0200 -Subject: [PATCH 2/3] nixpkgs: use system Go +Subject: [PATCH] nixpkgs: use system Go Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/dependency_imports.bzl | 2 +- - bazel/repositories.bzl | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index 1bf6c54a25..4e55a129e4 100644 +index c68eb4bf3e..addee4f6af 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -18,7 +18,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") +@@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") # go version for rules_go --GO_VERSION = "1.20" +-GO_VERSION = "1.23.1" +GO_VERSION = "host" JQ_VERSION = "1.7" YQ_VERSION = "4.24.4" -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index 02f7abd725..aad9adac24 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -246,9 +246,6 @@ def _go_deps(skip_targets): - if "io_bazel_rules_go" not in skip_targets: - external_http_archive( - name = "io_bazel_rules_go", -- # TODO(wrowe, sunjayBhatia): remove when Windows RBE supports batch file invocation -- patch_args = ["-p1"], -- patches = ["@envoy//bazel:rules_go.patch"], - ) - external_http_archive("bazel_gazelle") - --- -2.45.1 - diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/third_party/nixpkgs/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch index ca304f1d81..8b1a0b0162 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -1,7 +1,7 @@ -From 1213bbf5583c6615f719e0acf5f568e08bca5b35 Mon Sep 17 00:00:00 2001 +From 3ecb08a7603a07310d1a38c0f47bc54bbe1f11c8 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:59:22 +0200 -Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains +Subject: [PATCH] nixpkgs: use system C/C++ toolchains Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- @@ -9,10 +9,10 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index 4e55a129e4..6c2a5f0d82 100644 +index addee4f6af..dc1967e43b 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -24,7 +24,11 @@ JQ_VERSION = "1.7" +@@ -26,7 +26,11 @@ JQ_VERSION = "1.7" YQ_VERSION = "4.24.4" def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION): @@ -25,6 +25,3 @@ index 4e55a129e4..6c2a5f0d82 100644 go_rules_dependencies() go_register_toolchains(go_version) if go_version != "host": --- -2.45.1 - diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel b/third_party/nixpkgs/pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel new file mode 100644 index 0000000000..5531517add --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel @@ -0,0 +1,54 @@ +load("@bazel_tools//tools/sh:sh_toolchain.bzl", "sh_toolchain") +load("@rules_rust//rust:toolchain.bzl", "rust_toolchain") + +toolchains = { + "x86_64": "x86_64-unknown-linux-gnu", + "aarch64": "aarch64-unknown-linux-gnu", +} + +exports_files(["cargo", "rustdoc", "ruststd", "rustc"]) + +[ + rust_toolchain( + name = "rust_nix_" + k + "_impl", + binary_ext = "", + dylib_ext = ".so", + exec_triple = v, + cargo = ":cargo", + rust_doc = ":rustdoc", + rust_std = ":ruststd", + rustc = ":rustc", + stdlib_linkflags = ["-ldl", "-lpthread"], + staticlib_ext = ".a", + target_triple = v, + ) + for k, v in toolchains.items() +] + +[ + toolchain( + name = "rust_nix_" + k, + exec_compatible_with = [ + "@platforms//cpu:" + k, + "@platforms//os:linux", + ], + target_compatible_with = [ + "@platforms//cpu:" + k, + "@platforms//os:linux", + ], + toolchain = ":rust_nix_" + k + "_impl", + toolchain_type = "@rules_rust//rust:toolchain_type", + ) + for k in toolchains.keys() +] + +sh_toolchain( + name = "local_sh_impl", + path = "@bash@", +) + +toolchain( + name = "local_sh", + toolchain = ":local_sh_impl", + toolchain_type = "@bazel_tools//tools/sh:toolchain_type", +) diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix b/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix index b6a0b77014..c2e5025e29 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix @@ -5,6 +5,10 @@ buildBazelPackage, fetchFromGitHub, stdenv, + cacert, + cargo, + rustc, + rustPlatform, cmake, gn, go, @@ -25,20 +29,20 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.31.2"; - rev = "cc4a75482810de4b84c301d13deb551bd3147339"; - hash = "sha256-mfQpEGLMJV3UKqcUdbhy6/pP1sWut26zjwN6vDE7LmA="; + version = "1.32.0"; + rev = "86dc7ef91ca15fb4957a74bd599397413fc26a24"; + hash = "sha256-Wcbt62RfaNcTntmPjaAM0cP3LJangm4ht7Q0bzEpu5A="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-9KXZdSvRfi5mWOSotG//+ljsx64I4bYwzbeQFuCIwDE="; - aarch64-linux = "sha256-knrCfUYUL+bYuHSNrNeX3SwoGDf2rLYNXuukEmj4BjA="; + x86_64-linux = "sha256-LkDNPFT7UUCsGPG1dMnwzdIw0lzc5+3JYDoblF5oZVk="; + aarch64-linux = "sha256-DkibjmY1YND9Q2aQ41bhNdch0SKM5ghY2mjYSQfV30M="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in -buildBazelPackage { +buildBazelPackage rec { pname = "envoy"; inherit (srcVer) version; bazel = bazel_6; @@ -58,6 +62,22 @@ buildBazelPackage { sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch sed -i '/javabase=/d' .bazelrc sed -i '/"-Werror"/d' bazel/envoy_internal.bzl + + mkdir -p bazel/nix/ + substitute ${./bazel_nix.BUILD.bazel} bazel/nix/BUILD.bazel \ + --subst-var-by bash "$(type -p bash)" + ln -sf "${cargo}/bin/cargo" bazel/nix/cargo + ln -sf "${rustc}/bin/rustc" bazel/nix/rustc + ln -sf "${rustc}/bin/rustdoc" bazel/nix/rustdoc + ln -sf "${rustPlatform.rustLibSrc}" bazel/nix/ruststd + substituteInPlace bazel/dependency_imports.bzl \ + --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \ + --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",' + + substitute ${./rules_rust_extra.patch} bazel/nix/rules_rust_extra.patch \ + --subst-var-by bash "$(type -p bash)" + cat bazel/nix/rules_rust_extra.patch bazel/rules_rust.patch > bazel/nix/rules_rust.patch + mv bazel/nix/rules_rust.patch bazel/rules_rust.patch ''; patches = [ @@ -79,14 +99,23 @@ buildBazelPackage { jdk ninja patchelf + cacert ]; buildInputs = [ linuxHeaders ]; fetchAttrs = { sha256 = depsHash; + env.CARGO_BAZEL_REPIN = true; dontUseCmakeConfigure = true; dontUseGnConfigure = true; + postPatch = '' + ${postPatch} + + substituteInPlace bazel/dependency_imports.bzl \ + --replace-fail 'crate_universe_dependencies(' 'crate_universe_dependencies(bootstrap=True, ' \ + --replace-fail 'crates_repository(' 'crates_repository(generator="@@cargo_bazel_bootstrap//:cargo-bazel", ' + ''; preInstall = '' # Strip out the path to the build location (by deleting the comment line). find $bazelOut/external -name requirements.bzl | while read requirements; do @@ -113,6 +142,12 @@ buildBazelPackage { # fix tcmalloc failure https://github.com/envoyproxy/envoy/issues/30838 sed -i '/TCMALLOC_GCC_FLAGS = \[/a"-Wno-changes-meaning",' $bazelOut/external/com_github_google_tcmalloc/tcmalloc/copts.bzl + + # Install repinned rules_rust lockfile + cp source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock $bazelOut/external/Cargo.Bazel.lock + + # Don't save cargo_bazel_bootstrap or the crate index cache + rm -rf $bazelOut/external/cargo_bazel_bootstrap $bazelOut/external/dynamic_modules_rust_sdk_crate_index/.cargo_home $bazelOut/external/dynamic_modules_rust_sdk_crate_index/splicing-output ''; }; buildAttrs = { @@ -125,7 +160,7 @@ buildBazelPackage { file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - "$execbin" + "$execbin" || echo "$execbin" done ln -s ${bazel-gazelle}/bin $bazelOut/external/bazel_gazelle_go_repository_tools/bin @@ -139,6 +174,9 @@ buildBazelPackage { $bazelOut/external/com_github_luajit_luajit/build.py \ $bazelOut/external/local_config_sh/BUILD \ $bazelOut/external/*_pip3/BUILD.bazel + + # Install repinned rules_rust lockfile + cp $bazelOut/external/Cargo.Bazel.lock source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock ''; installPhase = '' install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy @@ -162,6 +200,9 @@ buildBazelPackage { "--java_runtime_version=local_jdk" "--tool_java_runtime_version=local_jdk" + # Force use of system Rust. + "--extra_toolchains=//bazel/nix:rust_nix_aarch64,//bazel/nix:rust_nix_x86_64" + # undefined reference to 'grpc_core::*Metadata*::*Memento* # # During linking of the final binary, we see undefined references to grpc_core related symbols. @@ -182,6 +223,9 @@ buildBazelPackage { bazelFetchFlags = [ "--define=wasm=${wasmRuntime}" + # Force use of system Rust. + "--extra_toolchains=//bazel/nix:rust_nix_aarch64,//bazel/nix:rust_nix_x86_64" + # https://github.com/bazelbuild/rules_go/issues/3844 "--repo_env=GOPROXY=https://proxy.golang.org,direct" "--repo_env=GOSUMDB=sum.golang.org" diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/rules_rust_extra.patch b/third_party/nixpkgs/pkgs/by-name/en/envoy/rules_rust_extra.patch new file mode 100644 index 0000000000..86ff5fb60f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/rules_rust_extra.patch @@ -0,0 +1,18 @@ +--- crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh ++++ crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@bash@ + # + # For details, see: + # `@rules_rust//crate_universe/src/metadata/cargo_tree_resolver.rs - TreeResolver::create_rustc_wrapper` + +--- util/process_wrapper/private/process_wrapper.sh ++++ util/process_wrapper/private/process_wrapper.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@bash@ + + set -euo pipefail + + diff --git a/third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix b/third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix new file mode 100644 index 0000000000..a73b64043b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + ruby, + fetchurl, + openssl, + ncurses, + libiconv, + tcl, + libxcrypt, + perl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "epic5"; + version = "3.0"; + + src = fetchurl { + url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz"; + hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE="; + }; + + buildInputs = + [ + openssl + ncurses + libxcrypt + ruby + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + tcl + ]; + + configureFlags = [ + "--with-ipv6" + ]; + + nativeBuildInputs = [ + perl + ]; + + meta = { + homepage = "https://epicsol.org"; + description = "IRC client that offers a great ircII interface"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "epic5"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/eq/equibop/disable_update_checking.patch b/third_party/nixpkgs/pkgs/by-name/eq/equibop/disable_update_checking.patch new file mode 100644 index 0000000000..6b2a9a4cb5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/eq/equibop/disable_update_checking.patch @@ -0,0 +1,16 @@ +diff --git i/src/main/index.ts w/src/main/index.ts +index 23ea0d6..1ef465f 100644 +--- i/src/main/index.ts ++++ w/src/main/index.ts +@@ -32,7 +32,9 @@ if (process.platform === "linux") { + if (IS_DEV) { + require("source-map-support").install(); + } else { +- autoUpdater.checkForUpdatesAndNotify(); ++ console.log("Update checking is disabled. Skipping..."); ++ // autoUpdater.checkForUpdatesAndNotify(); ++ + } + + // Make the Vencord files use our DATA_DIR + diff --git a/third_party/nixpkgs/pkgs/by-name/eq/equibop/package.nix b/third_party/nixpkgs/pkgs/by-name/eq/equibop/package.nix new file mode 100644 index 0000000000..dd5688115b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/eq/equibop/package.nix @@ -0,0 +1,153 @@ +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + equicord, + electron, + libicns, + pipewire, + libpulseaudio, + autoPatchelfHook, + pnpm_9, + nodejs, + nix-update-script, + withTTS ? true, + withMiddleClickScroll ? false, + # Enables the use of Equicord from nixpkgs instead of + # letting Equibop manage it's own version + withSystemEquicord ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "equibop"; + version = "2.0.9"; + + src = fetchFromGitHub { + owner = "Equicord"; + repo = "Equibop"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-mK/zoW8Km6xlppxJnVbuas4yE1rpAOd9QnjETlxxnsE="; + }; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) + pname + version + src + patches + ; + hash = "sha256-TSdkHSZTbFf3Nq0QHDNTeUHmd6N+L1N1kSiKt0uNF6s="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package + # seems to build with or without this hook, but I (NotAShelf) don't have the + # time to test the consequences of removing this hook. Please open a pull + # request if this bothers you in some way. + autoPatchelfHook + copyDesktopItems + # we use a script wrapper here for environment variable expansion at runtime + # https://github.com/NixOS/nixpkgs/issues/172583 + makeWrapper + ]; + + buildInputs = [ + libpulseaudio + pipewire + stdenv.cc.cc.lib + ]; + + patches = + [ ./disable_update_checking.patch ] + ++ lib.optional withSystemEquicord (substituteAll { + inherit equicord; + src = ./use_system_equicord.patch; + }); + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + buildPhase = '' + runHook preBuild + + pnpm build + pnpm exec electron-builder \ + --dir \ + -c.asarUnpack="**/*.node" \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + postBuild = '' + pushd build + ${libicns}/bin/icns2png -x icon.icns + popd + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt/Equibop + cp -r dist/*unpacked/resources $out/opt/Equibop/ + + for file in build/icon_*x32.png; do + file_suffix=''${file//build\/icon_} + install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/equibop.png + done + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/equibop \ + --add-flags $out/opt/Equibop/resources/app.asar \ + ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + ''; + + desktopItems = makeDesktopItem { + name = "equibop"; + desktopName = "Equibop"; + exec = "equibop %U"; + icon = "equibop"; + startupWMClass = "Equibop"; + genericName = "Internet Messenger"; + keywords = [ + "discord" + "equibop" + "electron" + "chat" + ]; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; + }; + + passthru = { + inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Custom Discord App aiming to give you better performance and improve linux support"; + homepage = "https://github.com/Equicord/Equibop"; + changelog = "https://github.com/Equicord/Equibop/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.gpl3Only; + maintainers = [ + lib.maintainers.NotAShelf + ]; + mainProgram = "equibop"; + # I am not confident in my ability to support Darwin, please PR if this is important to you + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/eq/equibop/use_system_equicord.patch b/third_party/nixpkgs/pkgs/by-name/eq/equibop/use_system_equicord.patch new file mode 100644 index 0000000000..3321b72bb5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/eq/equibop/use_system_equicord.patch @@ -0,0 +1,17 @@ +diff --git i/src/main/constants.ts w/src/main/constants.ts +index afb171f..c6a014e 100644 +--- i/src/main/constants.ts ++++ w/src/main/constants.ts +@@ -47,10 +47,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); + + // needs to be inline require because of circular dependency + // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised +-export const VENCORD_DIR = (() => { +- const { State } = require("./settings") as typeof import("./settings"); +- return State.store.vencordDir ? join(State.store.vencordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar"); +-})(); ++export const VENCORD_DIR = "@equicord@"; + + export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`; + + diff --git a/third_party/nixpkgs/pkgs/by-name/eq/equicord/package.nix b/third_party/nixpkgs/pkgs/by-name/eq/equicord/package.nix new file mode 100644 index 0000000000..1e1772934f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/eq/equicord/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + git, + lib, + nodejs, + pnpm_9, + stdenv, + buildWebExtension ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "equicord"; + version = "1.10.4"; # from package.json + + src = fetchFromGitHub { + owner = "Equicord"; + repo = "Equicord"; + rev = "440b68ea82b6fd44bf5ec70b759a0207ee9f4ca7"; + hash = "sha256-9GIw8g2HZ6/5Lb4gtDyuBqZWi5YK5Uz0lo+u+LrIZwI="; + }; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-kGLF6uIr0xxlB5LaSqKiBKESbmWN7PzDErrCmiT6vXA="; + }; + + nativeBuildInputs = [ + git + nodejs + pnpm_9.configHook + ]; + + env = { + EQUICORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}"; + EQUICORD_HASH = "${finalAttrs.src.rev}"; + }; + + buildPhase = '' + runHook preBuild + + pnpm run ${if buildWebExtension then "buildWeb" else "build"} \ + -- --standalone --disable-updater + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out + + runHook postInstall + ''; + + meta = { + description = "The other cutest Discord client mod"; + homepage = "https://github.com/Equicord/Equicord"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ + lib.maintainers.NotAShelf + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix b/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix index d983a41b29..88372821b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { pname = "errands"; - version = "46.2.5"; + version = "46.2.6"; pyproject = false; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; rev = "refs/tags/${version}"; - hash = "sha256-peIsTSmqjLHdmd5Xrqh6XKXjEbwhNE+FOH/pEY0QqdI="; + hash = "sha256-NIhDMsKPxxPJfDHXOpPl7NPUCO/M5wA2T72ej/+w+Z0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix b/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix index aad2b117eb..94fa9f5ca4 100644 --- a/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "espflash"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; rev = "refs/tags/v${version}"; - hash = "sha256-NplHzdUHlBgujH8rLYT5VbYBV7NljMJEbMAxZ5ZK8JY="; + hash = "sha256-X9VTwXk/6zAkQb5P9Wz8Pt4oIt2xXfff9dhGb8wauG4="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-iA8VJj0btFHUoyY7w8kR+9AU5Yrts4ctr90jxlWQu4c="; + cargoHash = "sha256-3xUDsznzIRlfGwVuIH1+Ub5tE/ST981KZS/2TAKaBAE="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd espflash \ diff --git a/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix b/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix index fb2bfbe7b1..a346ef8710 100644 --- a/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-10-09"; + version = "0-unstable-2024-10-21"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "c1a26cd7fa447b2802a4bececfd7cb9d316c0600"; - hash = "sha256-jtcfGmk03Yf5IaswIvi6N9oMXzNPYlJBf4WMLkogUVo="; + rev = "82a708f974b9a720e127c38a383f22e129be6373"; + hash = "sha256-BhhcYOipdLAviTzWRdNLMMPiND4mYv9Mkn8/yxo0vXY="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix index 0753bf9f8b..d94f62a634 100644 --- a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.2"; + version = "0.20.4"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-lit0v9emrAYkHWpCP1Z35UdrKdMiDh2HWeQg4WfxJIo="; + hash = "sha256-0wkFVExa8HCe3UBDMWjq2UAtrW1zmUQHAcVgWgmPPWM="; }; - cargoHash = "sha256-TwUbEeka20K9C8TvJH/Hiv8qp66TjAkcyMG7K2JuagQ="; + cargoHash = "sha256-GWrhW9+bX0pc78Seb6WHvWjCSe8XWKiHYUXRMFq+LbY="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/third_party/nixpkgs/pkgs/games/factorio/mods.nix b/third_party/nixpkgs/pkgs/by-name/fa/factorio/mods.nix similarity index 100% rename from third_party/nixpkgs/pkgs/games/factorio/mods.nix rename to third_party/nixpkgs/pkgs/by-name/fa/factorio/mods.nix diff --git a/third_party/nixpkgs/pkgs/by-name/fa/factorio/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/factorio/package.nix new file mode 100644 index 0000000000..c9b30b31b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fa/factorio/package.nix @@ -0,0 +1,310 @@ +{ + lib, + alsa-lib, + factorio-utils, + fetchurl, + libGL, + libICE, + libSM, + libX11, + libXcursor, + libXext, + libXi, + libXinerama, + libXrandr, + libpulseaudio, + libxkbcommon, + makeDesktopItem, + makeWrapper, + releaseType, + stdenv, + wayland, + + mods-dat ? null, + versionsJson ? ./versions.json, + username ? "", + token ? "", # get/reset token at https://factorio.com/profile + experimental ? false, # true means to always use the latest branch + ... +}@args: + +assert + releaseType == "alpha" + || releaseType == "headless" + || releaseType == "demo" + || releaseType == "expansion"; + +let + + inherit (lib) importJSON; + + mods = args.mods or [ ]; + + helpMsg = '' + + ===FETCH FAILED=== + Please ensure you have set the username and token with config.nix, or + /etc/nix/nixpkgs-config.nix if on NixOS. + + Your token can be seen at https://factorio.com/profile (after logging in). It is + not as sensitive as your password, but should still be safeguarded. There is a + link on that page to revoke/invalidate the token, if you believe it has been + leaked or wish to take precautions. + + Example: + { + packageOverrides = pkgs: { + factorio = pkgs.factorio.override { + username = "FactorioPlayer1654"; + token = "d5ad5a8971267c895c0da598688761"; + }; + }; + } + + Alternatively, instead of providing the username+token, you may manually + download the release through https://factorio.com/download , then add it to + the store using e.g.: + + releaseType=alpha + version=0.17.74 + nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + + Note the ultimate "_" is replaced with "-" in the --name arg! + ''; + + desktopItem = makeDesktopItem { + name = "factorio"; + desktopName = "Factorio"; + comment = "A game in which you build and maintain factories."; + exec = "factorio"; + icon = "factorio"; + categories = [ "Game" ]; + }; + + branch = if experimental then "experimental" else "stable"; + + # NB `experimental` directs us to take the latest build, regardless of its branch; + # hence the (stable, experimental) pairs may sometimes refer to the same distributable. + versions = importJSON versionsJson; + binDists = makeBinDists versions; + + actual = + binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} + or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); + + makeBinDists = + versions: + let + f = + path: name: value: + if builtins.isAttrs value then + if value ? "name" then makeBinDist value else builtins.mapAttrs (f (path ++ [ name ])) value + else + throw "expected attrset at ${toString path} - got ${toString value}"; + in + builtins.mapAttrs (f [ ]) versions; + makeBinDist = + { + name, + version, + tarDirectory, + url, + sha256, + needsAuth, + candidateHashFilenames ? [ ], + }: + { + inherit version tarDirectory; + src = + if !needsAuth then + fetchurl { inherit name url sha256; } + else + (lib.overrideDerivation + (fetchurl { + inherit name url sha256; + curlOptsList = [ + "--get" + "--data-urlencode" + "username@username" + "--data-urlencode" + "token@token" + ]; + }) + (_: { + # This preHook hides the credentials from /proc + preHook = + if username != "" && token != "" then + '' + echo -n "${username}" >username + echo -n "${token}" >token + '' + else + '' + # Deliberately failing since username/token was not provided, so we can't fetch. + # We can't use builtins.throw since we want the result to be used if the tar is in the store already. + exit 1 + ''; + failureHook = '' + cat < str: + if FLAGS.out: + return FLAGS.out + try_paths = ["pkgs/by-name/fa/factorio/versions.json", "versions.json"] + for path in try_paths: + if os.path.exists(path): + return path + raise Exception( + "Couldn't figure out where to write versions.json; try specifying --out" + ) + + +def fetch_versions() -> FactorioVersionsJSON: + return json.loads(requests.get(FACTORIO_RELEASES).text) + + +def fetch_hashes() -> FactorioHashes: + resp = requests.get(FACTORIO_HASHES) + resp.raise_for_status() + out = {} + for ln in resp.text.split("\n"): + ln = ln.strip() + if not ln: + continue + sha256, filename = ln.split() + out[filename] = sha256 + return out + + +def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON: + def rec_dd(): + return defaultdict(rec_dd) + + output = rec_dd() + + # Deal with times where there's no experimental version + for rc in RELEASE_CHANNELS: + if rc.name not in factorio_versions or not factorio_versions[rc.name]: + factorio_versions[rc.name] = factorio_versions["stable"] + for rt in RELEASE_TYPES: + if ( + rt.name not in factorio_versions[rc.name] + or not factorio_versions[rc.name][rt.name] + ): + factorio_versions[rc.name][rt.name] = factorio_versions["stable"][ + rt.name + ] + + for system in SYSTEMS: + for release_type in RELEASE_TYPES: + for release_channel in RELEASE_CHANNELS: + version = factorio_versions[release_channel.name].get(release_type.name) + if version is None: + continue + this_release = { + "name": f"factorio_{release_type.name}_{system.tar_name}-{version}.tar.xz", + "url": f"https://factorio.com/get-download/{version}/{release_type.name}/{system.url_name}", + "version": version, + "needsAuth": release_type.needs_auth, + "candidateHashFilenames": [ + fmt.format(version=version) + for fmt in release_type.hash_filename_format + ], + "tarDirectory": system.tar_name, + } + output[system.nix_name][release_type.name][release_channel.name] = ( + this_release + ) + return output + + +def iter_version( + versions: OurVersionJSON, + it: Callable[[str, str, str, Dict[str, str]], Dict[str, str]], +) -> OurVersionJSON: + versions = copy.deepcopy(versions) + for system_name, system in versions.items(): + for release_type_name, release_type in system.items(): + for release_channel_name, release in release_type.items(): + release_type[release_channel_name] = it( + system_name, release_type_name, release_channel_name, dict(release) + ) + return versions + + +def merge_versions(old: OurVersionJSON, new: OurVersionJSON) -> OurVersionJSON: + """Copies already-known hashes from version.json to avoid having to re-fetch.""" + + def _merge_version( + system_name: str, + release_type_name: str, + release_channel_name: str, + release: Dict[str, str], + ) -> Dict[str, str]: + old_system = old.get(system_name, {}) + old_release_type = old_system.get(release_type_name, {}) + old_release = old_release_type.get(release_channel_name, {}) + if FLAGS.release_type and release_type_name not in FLAGS.release_type: + logging.info( + "%s/%s/%s: not in --release_type, not updating", + system_name, + release_type_name, + release_channel_name, + ) + return old_release + if FLAGS.release_channel and release_channel_name not in FLAGS.release_channel: + logging.info( + "%s/%s/%s: not in --release_channel, not updating", + system_name, + release_type_name, + release_channel_name, + ) + return old_release + if "sha256" not in old_release: + logging.info( + "%s/%s/%s: not copying sha256 since it's missing", + system_name, + release_type_name, + release_channel_name, + ) + return release + if not all( + old_release.get(k, None) == release[k] for k in ["name", "version", "url"] + ): + logging.info( + "%s/%s/%s: not copying sha256 due to mismatch", + system_name, + release_type_name, + release_channel_name, + ) + return release + release["sha256"] = old_release["sha256"] + return release + + return iter_version(new, _merge_version) + + +def fill_in_hash( + versions: OurVersionJSON, factorio_hashes: FactorioHashes +) -> OurVersionJSON: + """Fill in sha256 hashes for anything missing them.""" + + def _fill_in_hash( + system_name: str, + release_type_name: str, + release_channel_name: str, + release: Dict[str, str], + ) -> Dict[str, str]: + for candidate_filename in release["candidateHashFilenames"]: + if candidate_filename in factorio_hashes: + release["sha256"] = factorio_hashes[candidate_filename] + break + else: + logging.error( + "%s/%s/%s: failed to find any of %s in %s", + system_name, + release_type_name, + release_channel_name, + release["candidateHashFilenames"], + FACTORIO_HASHES, + ) + return release + if "sha256" in release: + logging.info( + "%s/%s/%s: skipping fetch, sha256 already present", + system_name, + release_type_name, + release_channel_name, + ) + return release + return release + + return iter_version(versions, _fill_in_hash) + + +def main(argv): + factorio_versions = fetch_versions() + factorio_hashes = fetch_hashes() + new_our_versions = generate_our_versions(factorio_versions) + old_our_versions = None + our_versions_path = find_versions_json() + if our_versions_path: + logging.info("Loading old versions.json from %s", our_versions_path) + with open(our_versions_path, "r") as f: + old_our_versions = json.load(f) + if old_our_versions: + logging.info("Merging in old hashes") + new_our_versions = merge_versions(old_our_versions, new_our_versions) + logging.info("Updating hashes from Factorio SHA256") + new_our_versions = fill_in_hash(new_our_versions, factorio_hashes) + with open(our_versions_path, "w") as f: + logging.info("Writing versions.json to %s", our_versions_path) + json.dump(new_our_versions, f, sort_keys=True, indent=2) + f.write("\n") + + +if __name__ == "__main__": + app.run(main) diff --git a/third_party/nixpkgs/pkgs/games/factorio/utils.nix b/third_party/nixpkgs/pkgs/by-name/fa/factorio/utils.nix similarity index 100% rename from third_party/nixpkgs/pkgs/games/factorio/utils.nix rename to third_party/nixpkgs/pkgs/by-name/fa/factorio/utils.nix diff --git a/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json b/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json new file mode 100644 index 0000000000..273ba332e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json @@ -0,0 +1,102 @@ +{ + "x86_64-linux": { + "alpha": { + "experimental": { + "candidateHashFilenames": [ + "factorio_linux_2.0.9.tar.xz" + ], + "name": "factorio_alpha_x64-2.0.9.tar.xz", + "needsAuth": true, + "sha256": "34c21cd3cbe91b65483786ccb4467b5d4766c748cbbddd2ce3b30d319d163e3b", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.9/alpha/linux64", + "version": "2.0.9" + }, + "stable": { + "candidateHashFilenames": [ + "factorio_linux_2.0.8.tar.xz" + ], + "name": "factorio_alpha_x64-2.0.8.tar.xz", + "needsAuth": true, + "sha256": "94ea36a5b9103369df7158a8281039dd2f1d7fa7bb3a2d854c715250dd73e185", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", + "version": "2.0.8" + } + }, + "demo": { + "experimental": { + "candidateHashFilenames": [ + "factorio_demo_x64_1.1.110.tar.xz" + ], + "name": "factorio_demo_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" + }, + "stable": { + "candidateHashFilenames": [ + "factorio_demo_x64_1.1.110.tar.xz" + ], + "name": "factorio_demo_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" + } + }, + "expansion": { + "experimental": { + "candidateHashFilenames": [ + "factorio-space-age_linux_2.0.9.tar.xz" + ], + "name": "factorio_expansion_x64-2.0.9.tar.xz", + "needsAuth": true, + "sha256": "6369d23550a7a721d3de1d34253e8321ee601fa759d1fb5efac9abc28aa7509d", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.9/expansion/linux64", + "version": "2.0.9" + }, + "stable": { + "candidateHashFilenames": [ + "factorio-space-age_linux_2.0.8.tar.xz" + ], + "name": "factorio_expansion_x64-2.0.8.tar.xz", + "needsAuth": true, + "sha256": "408eae824daa761564b1ea7b81925efe05298cbaffd120eea235341ac05a6a60", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/expansion/linux64", + "version": "2.0.8" + } + }, + "headless": { + "experimental": { + "candidateHashFilenames": [ + "factorio-headless_linux_2.0.9.tar.xz", + "factorio_headless_x64_2.0.9.tar.xz" + ], + "name": "factorio_headless_x64-2.0.9.tar.xz", + "needsAuth": false, + "sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.9/headless/linux64", + "version": "2.0.9" + }, + "stable": { + "candidateHashFilenames": [ + "factorio-headless_linux_2.0.8.tar.xz", + "factorio_headless_x64_2.0.8.tar.xz" + ], + "name": "factorio_headless_x64-2.0.8.tar.xz", + "needsAuth": false, + "sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/headless/linux64", + "version": "2.0.8" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fceux/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fceux/package.nix new file mode 100644 index 0000000000..c0355e9e30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fceux/package.nix @@ -0,0 +1,75 @@ +{ + lib, + SDL2, + cmake, + fetchFromGitHub, + ffmpeg, + libX11, + libXdmcp, + libxcb, + lua5_1, + minizip, + pkg-config, + qt5, + qt6, + stdenv, + x264, + # Configurable options + ___qtVersion ? "5", +}: + +let + qtVersionDictionary = { + "5" = qt5; + "6" = qt6; + }; + inherit (qtVersionDictionary.${___qtVersion}) qttools wrapQtAppsHook; +in +assert lib.elem ___qtVersion [ + "5" + "6" +]; +stdenv.mkDerivation (finalAttrs: { + pname = "fceux"; + version = "2.6.6-unstable-2024-06-09"; + + src = fetchFromGitHub { + owner = "TASEmulators"; + repo = "fceux"; + rev = "f980ec2bc7dc962f6cd76b9ae3131f2eb902c9e7"; + hash = "sha256-baAjrTzRp61Lw1p5axKJ97PuFiuBNQewXrlN0s8o7us="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + SDL2 + ffmpeg + libX11 + libXdmcp + libxcb + lua5_1 + minizip + qttools + x264 + ]; + + strictDeps = true; + + meta = { + homepage = "http://www.fceux.com/"; + description = "Nintendo Entertainment System (NES) Emulator"; + changelog = "https://github.com/TASEmulators/blob/fceux/${finalAttrs.src.rev}/changelog.txt"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "fceux"; + maintainers = with lib.maintainers; [ + AndersonTorres + sbruder + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 7f1abd0176..7f9bb24d6f 100644 --- a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20240909"; + version = "20241009"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-+e4azEWHYSh3Gy9Xa+Y8E7f7rAA8YlWlbvbva9kNXCI="; + hash = "sha256-tb+Z7ja6yG7n6DcxSvdFhMq2xTNs6mJ6pdPfEKeRUww="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/fd/fdroidserver/package.nix b/third_party/nixpkgs/pkgs/by-name/fd/fdroidserver/package.nix index 832b2d62cc..d8699f4810 100644 --- a/third_party/nixpkgs/pkgs/by-name/fd/fdroidserver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fd/fdroidserver/package.nix @@ -48,7 +48,10 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - build-system = with python3Packages; [ babel ]; + build-system = with python3Packages; [ + setuptools + babel + ]; dependencies = with python3Packages; [ androguard diff --git a/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix index df8f9dc5eb..db26c0d610 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix @@ -11,13 +11,13 @@ }: let pname = "feishin"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-YdtGhGcG5qVoVa1534NQIbI02gy0pzR9U1PU2lL1u/A="; + hash = "sha256-fHaNluLes25P/mSTSYFt97pC6uKYuBI/3PUHc84zoWg="; }; electron = electron_31; @@ -26,7 +26,7 @@ buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-3fY0NCswRTnpDDsr1fDK9YZm8TUKCIMJ1+yw38dj0M8="; + npmDepsHash = "sha256-8xFB47PJpa+3U+Xy+DEdWoW3/f+naFKtLQsDDVgUccA="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-YkLT69QU7WMGRe95rfZ8TmnfIdWwtpWaqGY+wU48veQ="; + npmDepsHash = "sha256-gufOUBfHTDkIqRTdPqXuuk1ZT0y80y/GyI7ssvHnBYo="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/fi/fireplace/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/fireplace/package.nix index f7791438ec..1a41a09d85 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/fireplace/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/fireplace/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc="; }; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin [ "CC=cc" ]; + meta = { description = "Cozy fireplace in your terminal"; homepage = "https://github.com/Wyatt915/fireplace"; diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix index 343fef81b3..f9a72c2472 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.46"; + version = "3.11.48"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-zaysfvfsuA4XTj46vN1FHggqEaL8rfHL0UJVILhrwjg="; + hash = "sha256-EgRV0xRBgPInYbU9ZqJEyrbD58DIm2mYPRDSN6vrnjo="; }; # relax dep constrains, keep environment constraints diff --git a/third_party/nixpkgs/pkgs/by-name/fo/folio/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/folio/package.nix index 5da5b3a1c3..ea331f178f 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/folio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/folio/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "folio"; - version = "24.11"; + version = "24.12"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; rev = version; - hash = "sha256-55zNxZbta12T/N6ruzY+/FVlinVMYcE02C48nTQUeO4="; + hash = "sha256-0Aq8R+5k5LCmciRHauTvxuJWCyN3FN4sP9aEPNlMn+k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix index dba8ba8eb2..cb09cd001e 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-JFAONU1C8pB2Hu4PJqqdqcXk9Ec+iPiAL8J+dk4oPj0="; + hash = "sha256-e9Ui3oIS0wbDLgntF7PQZCll12yvWeKLISXVoK6BjuE="; }; env = { diff --git a/third_party/nixpkgs/pkgs/by-name/fo/foxmarks/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/foxmarks/package.nix new file mode 100644 index 0000000000..289719b3c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fo/foxmarks/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + sqlite, +}: + +rustPlatform.buildRustPackage rec { + pname = "foxmarks"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "zer0-x"; + repo = "foxmarks"; + rev = "v${version}"; + hash = "sha256-tkmmu6A7vqK4yO9zHjVEeACaOHP3+hJQLBK7p/Svn7Q="; + }; + + cargoHash = "sha256-m3JtibgNHsZScxziNEu1ycslJocBXRbtloMWE0G5ZyM="; + + buildInputs = [ sqlite ]; + + meta = { + description = "CLI read-only interface for Mozilla Firefox's bookmarks"; + homepage = "https://github.com/zer0-x/foxmarks"; + changelog = "https://github.com/zer0-x/foxmarks/blobl/v${version}/CHANGELOG.md"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ loicreynier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch b/third_party/nixpkgs/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch new file mode 100644 index 0000000000..3e55b66102 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch @@ -0,0 +1,61 @@ +diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp +index 5f92058c18..b00104497b 100644 +--- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp ++++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp +@@ -56,27 +56,34 @@ namespace + * + * Based on + * https://stackoverflow.com/questions/18896933/qt-qfont-selection-of-a-monospace-font-doesnt-work ++ * Local fix to based on comment in ++ * https://github.com/FreeCAD/FreeCAD/issues/10514#issuecomment-1849176386 + */ ++bool hasFixedPitch(const QFont& font) ++{ ++ return QFontInfo(font).fixedPitch(); ++} ++ + QFont getMonospaceFont() + { +- QFont font(QString::fromLatin1("monospace")); +- if (font.fixedPitch()) { +- return font; +- } +- font.setStyleHint(QFont::Monospace); +- if (font.fixedPitch()) { +- return font; ++ if (QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); hasFixedPitch(font)) { ++ return font; // should typically work. + } +- font.setStyleHint(QFont::TypeWriter); +- if (font.fixedPitch()) { ++ ++ QFont font; // default QApplication font ++ font.setStyleHint(QFont::Courier); // may not work ++ if (hasFixedPitch(font)) { + return font; + } +- font.setFamily(QString::fromLatin1("courier")); +- if (font.fixedPitch()) { +- return font; ++ for (const char* family : {"Monospace", "Courier"}) { ++ font.setFamily(QString::fromLatin1(family)); ++ if (hasFixedPitch(font)) { ++ return font; ++ } + } +- return font; // We failed, but return whatever we have anyway ++ return font; + } ++ + } // namespace + + /* TRANSLATOR Gui::Dialog::DlgSettingsEditor */ +@@ -302,7 +309,7 @@ void DlgSettingsEditor::loadSettings() + ui->fontSize->setValue(10); + ui->fontSize->setValue(hGrp->GetInt("FontSize", ui->fontSize->value())); + +- QByteArray defaultMonospaceFont = getMonospaceFont().family().toLatin1(); ++ QByteArray defaultMonospaceFont = QFontInfo(getMonospaceFont()).family().toLatin1(); + + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QStringList familyNames = QFontDatabase().families(QFontDatabase::Any); diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix index adb558c7e4..83d7598ce3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ./0002-FreeCad-OndselSolver-pkgconfig.patch + ./0003-freecad-font-issue-10514.patch ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fr/frog-protocols/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/frog-protocols/package.nix new file mode 100644 index 0000000000..e9bc5e87fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fr/frog-protocols/package.nix @@ -0,0 +1,43 @@ +{ + fetchFromGitHub, + lib, + meson, + ninja, + nix-update-script, + stdenv, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "frog-protocols"; + version = "0.01-unstable-2024-09-25"; + + src = fetchFromGitHub { + owner = "misyltoad"; + repo = "frog-protocols"; + rev = "17be81da707722b4f907c5287def442351b219b0"; + hash = "sha256-N8a+o5I7CRoONCvjMHVmPkJTVncczuFVRHEtMFzMzss="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + }; + + meta = { + description = "Wayland protocols but much more iterative"; + homepage = "https://github.com/misyltoad/frog-protocols"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + getchoo + Scrumplex + ]; + platforms = lib.platforms.all; + pkgConfigModules = [ "frog-protocols" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix b/third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix index 47917784aa..8b9428c6b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix @@ -7,7 +7,7 @@ , pkg-config , makeWrapper , fftw -, fmt_8 +, fmt , freetype , libsndfile , libX11 @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fftw - fmt_8 + fmt freetype libsndfile rtmidi diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gersemi/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gersemi/package.nix index 969f8caa41..0712846cc7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ge/gersemi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/gersemi/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.15.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; rev = version; - hash = "sha256-MyiGmMITD6TlZ98qsSDalQWOWnpqelTrXKn6MmBGYS0="; + hash = "sha256-B2mDtMLJTriSeeH0SLQ7qP/PyaNE5eTQ/mgm4S5B8g0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix index f3b2a4723d..9519c7840e 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "0.1.1"; + version = "0.5.1"; in rustPlatform.buildRustPackage { pname = "git-prole"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "9999years"; repo = "git-prole"; rev = "refs/tags/v${version}"; - hash = "sha256-IJsNZt5eID1ghz5Rj53OfidgPoMS2qq+7qgqYEu4zPc="; + hash = "sha256-jJEskahZRCpM2WEH4myTLfowQxEJ4WCNXbTwGkwBHnY="; }; - cargoHash = "sha256-2z7UEHVomm2zuImdcQq0G9fEhKrHLrPNUhVrFugG3w4="; + cargoHash = "sha256-u4UJH+dIDI+I6fEQTRe3RRufYZwxBENxnwULSSCOZF8="; nativeCheckInputs = [ git diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-spice/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-spice/package.nix index 08e9260361..60b1e35d70 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-spice/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-spice/package.nix @@ -1,26 +1,30 @@ { lib, + stdenv, buildGo123Module, fetchFromGitHub, git, nix-update-script, + installShellFiles, }: buildGo123Module rec { pname = "git-spice"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; rev = "refs/tags/v${version}"; - hash = "sha256-VODBN+3xDa+sGynhnWnnhPy0VEKPWOQeh2Ge75OTS0A="; + hash = "sha256-ap0ZGRDdHQMVYSk9J8vsZNpvaAwpHFmPT5REiCxYepQ="; }; - vendorHash = "sha256-irYXuh0KmCmeZ2fKNduu7zpVqDQmmR7H2bNTMa2zOjI="; + vendorHash = "sha256-YJ8OxmonnxNu4W17tD1Z7K625LCINlh6ZgoxOpmtNC0="; subPackages = [ "." ]; + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ git ]; buildInputs = [ git ]; @@ -31,6 +35,21 @@ buildGo123Module rec { "-X=main._version=${version}" ]; + __darwinAllowLocalNetworking = true; + + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + # timeout + rm testdata/script/branch_submit_remote_prompt.txt + rm testdata/script/branch_submit_multiple_pr_templates.txt + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gs \ + --bash <($out/bin/gs shell completion bash) \ + --zsh <($out/bin/gs shell completion zsh) \ + --fish <($out/bin/gs shell completion fish) + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix index af81f5021f..ea4ee4717e 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-r2PkNDvOofginL5Y0K+7Qhnsev2zle1q9qraG/ub7Wo="; + hash = "sha256-rlEwFwN6DrOJZm1Hzy6qu7rLKQx69rRIqrScx9FExZM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix index 28119445dc..61e2d5d841 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitlab-release-cli"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "release-cli"; rev = "v${version}"; - hash = "sha256-CCSice/uMf2OfFNEpwwhX6A0wrSsC1v9XWEhAAwQRso="; + hash = "sha256-AEDao1tehg15SmluHlivG/I+Y9Gcxjj7KUEGAmOZ1aY="; }; vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix index f72da4c085..dbdd5ce9db 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix @@ -6,15 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gitxray"; - version = "1.0.15-unstable-2024-09-20"; + version = "1.0.16"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; - # https://github.com/kulkansecurity/gitxray/issues/1 - rev = "7e02f8c789f1c8bf3f4df6c1c301d1a666cedd1c"; - hash = "sha256-ucXHfclvaAbSi2HtrhkR2iW0r7jWq9yHqROwRAowOhA="; + rev = "refs/tags/${version}"; + hash = "sha256-sBDKRHNhRG0SUd9G0+iiKOB+lqzISi92itbZIT+j4ME="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix index 7804acd778..80ea584a63 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix @@ -3,29 +3,31 @@ , fetchurl , substituteAll , bubblewrap +, cairo , cargo , git +, gnome +, gtk4 +, lcms2 +, libheif +, libjxl +, librsvg +, libseccomp +, libxml2 , meson , ninja , pkg-config , rustc , rustPlatform -, gtk4 -, cairo -, libheif -, libxml2 -, libseccomp -, libjxl -, gnome }: stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz"; - hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8="; + url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; + hash = "sha256-Vg7kIWfB7SKCZhjmHYPkkUDbW/R6Zam6js4s1z0qSqg="; }; patches = [ @@ -49,15 +51,24 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 # for GdkTexture cairo + lcms2 libheif libxml2 # for librsvg crate + librsvg libseccomp libjxl ]; + mesonFlags = [ + "-Dglycin-loaders=true" + "-Dlibglycin=false" + "-Dvapi=false" + ]; + passthru = { updateScript = gnome.updateScript { - packageName = "glycin-loaders"; + attrPath = "glycin-loaders"; + packageName = "glycin"; }; glycinPathsPatch = substituteAll { diff --git a/third_party/nixpkgs/pkgs/by-name/gm/gmrun/package.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmrun/package.nix new file mode 100644 index 0000000000..1a87c20d12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gm/gmrun/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gmrun"; + version = "1.4w"; + + src = fetchFromGitHub { + owner = "wdlkmpx"; + repo = "gmrun"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-sp+Atod9ZKVF8sxNWIMrlewqZAGnoLo2mZUNkCtSkec="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + doCheck = true; + + enableParallelBuilding = true; + + # Problem with component size on wayland + preFixup = '' + gappsWrapperArgs+=(--set-default GDK_BACKEND x11) + ''; + + meta = { + description = "Gnome Completion-Run Utility"; + longDescription = '' + A simple program which provides a "run program" window, featuring a bash-like TAB completion. + It uses GTK interface. + Also, supports CTRL-R / CTRL-S / "!" for searching through history. + Running commands in a terminal with CTRL-Enter. URL handlers. + ''; + homepage = "https://github.com/wdlkmpx/gmrun"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + mainProgram = "gmrun"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-commander/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-commander/package.nix new file mode 100644 index 0000000000..4de7e5f1e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-commander/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + flex, + itstool, + rustPlatform, + rustc, + cargo, + wrapGAppsHook4, + desktop-file-utils, + exiv2, + libgsf, + taglib, + poppler, + samba, + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-commander"; + version = "1.18.1-unstable-2024-10-18"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-commander"; + rev = "28dadb1ef9342bb1a5f9a65b1a5bf3bd80e3d30a"; + hash = "sha256-DxsZJht+PD3vY5vc1vzpRD8FHBPKcjK4qfke5nhvHS0="; + }; + + # hard-coded schema paths + postPatch = '' + substituteInPlace src/gnome-cmd-data.cc plugins/fileroller/file-roller-plugin.cc \ + --replace-fail \ + '/share/glib-2.0/schemas' \ + '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-Nx/e2H9NxCTj62xVDlKTpPdjlxAx2YAcQJh1kHByrd4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + flex + itstool + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + exiv2 + libgsf + taglib + poppler + samba + gtest + ]; + + meta = { + description = "Fast and powerful twin-panel file manager for the Linux desktop"; + homepage = "https://gcmd.github.io"; + license = lib.licenses.gpl2Plus; + mainProgram = "gnome-commander"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/go/godot_4/package.nix b/third_party/nixpkgs/pkgs/by-name/go/godot_4/package.nix index 25c36e07a1..829ece63d5 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/godot_4/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/godot_4/package.nix @@ -28,7 +28,6 @@ wayland, wayland-scanner, withDbus ? true, - withDebug ? false, withFontconfig ? true, withPlatform ? "linuxbsd", withPrecision ? "single", @@ -67,6 +66,7 @@ stdenv.mkDerivation rec { "out" "man" ]; + separateDebugInfo = true; # Set the build name which is part of the version. In official downloads, this # is set to 'official'. When not specified explicitly, it is set to @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { production = true; # Set defaults to build Godot for use in production platform = withPlatform; target = withTarget; - debug_symbols = withDebug; + debug_symbols = true; # Options from 'platform/linuxbsd/detect.py' dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings @@ -159,8 +159,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withSpeechd [ speechd-minimal ] ++ lib.optionals withUdev [ udev ]; - dontStrip = withDebug; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix b/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix index 16ba288e1d..92d46adbd7 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm'.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-8i/ip0ZIo80bLb7UNO/h856CD7i3DV9QaPaNrxhViqE="; + hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ="; }; env = { diff --git a/third_party/nixpkgs/pkgs/by-name/go/goose-lang/package.nix b/third_party/nixpkgs/pkgs/by-name/go/goose-lang/package.nix new file mode 100644 index 0000000000..4d2f96fca7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/goose-lang/package.nix @@ -0,0 +1,33 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: + +buildGoModule rec { + pname = "goose-lang"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "goose-lang"; + repo = "goose"; + rev = "v${version}"; + hash = "sha256-P26Q21MWrne1pB3/EvLYp2i8Xw7oG9Waer2hhHyco1A="; + }; + + vendorHash = "sha256-HCJ8v3TSv4UrkOsRuENWVz5Z7zQ1UsOygx0Mo7MELzY="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Goose converts a small subset of Go to Coq"; + homepage = "https://github.com/goose-lang/goose"; + changelog = "https://github.com/goose-lang/goose/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stepbrobd ]; + mainProgram = "goose"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix index 786123e74d..49277a0a24 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix @@ -1,6 +1,8 @@ { rustPlatform, + glib-networking, gpauth, + makeWrapper, openconnect, openssl, perl, @@ -15,11 +17,15 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "apps/gpclient"; cargoHash = "sha256-aJYFBvVrj1n2+9WLLBH5WTRRzTle19LsdJ2DielJYik="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + perl + makeWrapper + ]; buildInputs = [ gpauth openconnect openssl + glib-networking ]; preConfigure = '' @@ -34,6 +40,11 @@ rustPlatform.buildRustPackage rec { cp packaging/files/usr/share/applications/gpgui.desktop $out/share/applications/gpgui.desktop ''; + preFixup = '' + wrapProgram "$out/bin/gpclient" \ + --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules + ''; + postFixup = '' substituteInPlace $out/share/applications/gpgui.desktop \ --replace-fail /usr/bin/gpclient $out/bin/gpclient diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix index bb72042c21..d9801f5d70 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gpscorrelate"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "dfandrich"; repo = "gpscorrelate"; rev = version; - hash = "sha256-1t9XUY12hVaUNOg785dMJCiaMMCI2XCcif1DkKYXOoo="; + hash = "sha256-H1kqOzL79/Y1kHVEQ5y9JRWTDCBMbtEPo75drm8+7Qo="; }; nativeBuildInputs = [ @@ -48,11 +48,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - # https://github.com/dfandrich/gpscorrelate/issues/29 - rm tests/data/test005.* - ''; - installTargets = [ "install" "install-po" "install-desktop-file" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix index 938b916689..125a3f4d46 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix @@ -3,6 +3,7 @@ , stdenv , fetchFromGitHub , fetchurl +, fetchpatch , cmake , qt6 , fmt @@ -16,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-aez/APsei30Tp1em/RDCuq+v8hOavHq4O9qZahrsF/g="; + hash = "sha256-QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -33,6 +34,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./embedding-local.patch + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051"; + sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU="; + # remove the `gpt4all-chat` part of the paths as sourceRoot is gpt4all-chat + stripLen = 1; + }) ]; sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; @@ -70,6 +77,8 @@ stdenv.mkDerivation (finalAttrs: { "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + "-DGGML_VULKAN=ON" + "-DGGML_KOMPUTE=ON" ] ++ lib.optionals (!cudaSupport) [ "-DLLMODEL_CUDA=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json deleted file mode 100644 index 5aa4d87333..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "name": "gramma", - "version": "1.6.0", - "license": "ISC", - "repository": "https://github.com/caderek/gramma", - "homepage": "https://caderek.github.io/gramma/", - "description": "Command line grammar checker", - "main": "src/index.js", - "bin": "src/cli.js", - "exports": { - ".": "./src/index.js", - "./esm": "./bundle/gramma.esm.js", - "./esm-min": "./bundle/gramma.esm.min.js", - "./iife": "./bundle/gramma.min.js" - }, - "types": "src/index.d.ts", - "scripts": { - "build": "rm -rf bin; yarn run build:win64; yarn run build:macos; yarn run build:linux64; yarn run build:zip; yarn run build:bundles", - "build:win64": "pkg -c package.json -t node16-win-x64 --out-path bin/windows64 src/cli.js", - "build:macos": "pkg -c package.json -t node16-macos-x64 --out-path bin/macos src/cli.js", - "build:linux64": "pkg -c package.json -t node16-linux-x64 --out-path bin/linux64 src/cli.js", - "build:bundles": "yarn run build:esm; yarn run build:esm-min; yarn run build:iife", - "build:esm": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.js --format=esm", - "build:esm-min": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.min.js --format=esm --minify", - "build:iife": "esbuild src/index.js --bundle --outfile=bundle/gramma.min.js --format=iife --minify --global-name=gramma", - "build:zip": "node scripts/zipBinaries.js", - "format": "prettier --write \"src/**/*.js\"", - "lint": "eslint src/**", - "test": "jest", - "test:ci": "jest --coverage && cat ./coverage/lcov.info | codacy-coverage", - "check:langs": "node scripts/checkLanguagesSupport.js", - "prepare": "husky install", - "definitions": "tsc" - }, - "keywords": [ - "grammar", - "command-line", - "checker" - ], - "author": "Maciej Cąderek | maciej.caderek@gmail.com", - "dependencies": { - "cli-progress": "^3.9.1", - "decompress": "^4.2.1", - "decompress-unzip": "^4.0.1", - "dotenv": "^10.0.0", - "intercept-stdout": "^0.1.2", - "isomorphic-fetch": "^3.0.0", - "kleur": "^4.1.4", - "portfinder": "^1.0.28", - "progress-stream": "^2.0.0", - "prompts": "^2.4.1", - "query-string": "^7.0.1", - "rimraf": "^3.0.2", - "tcp-port-used": "^1.0.2", - "yargs": "^17.2.1" - }, - "devDependencies": { - "@types/jest": "^27.0.2", - "codacy-coverage": "^3.4.0", - "esbuild": "^0.13.4", - "eslint": "^7.32.0", - "eslint-config-airbnb": "^18.2.1", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-import": "^2.24.2", - "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-react": "^7.26.1", - "gramma": "^1.5.0", - "husky": "^7.0.0", - "jest": "^27.2.4", - "pkg": "^5.3.3", - "prettier": "^2.4.1", - "shelljs": "^0.8.4", - "typescript": "^4.4.3" - }, - "jest": { - "verbose": true, - "testMatch": [ - "**/?(*.)(spec|test).?(m)js" - ] - }, - "engines": { - "node": ">=12.0.0" - } -} diff --git a/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix index d5ba331d00..2161522c3f 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix @@ -1,34 +1,50 @@ { lib, - mkYarnPackage, + stdenvNoCC, fetchYarnDeps, fetchFromGitHub, - nix-update-script -}: mkYarnPackage rec { + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gramma"; version = "1.6.0"; src = fetchFromGitHub { owner = "caderek"; repo = "gramma"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-gfBwKpsttdhjD/Opn8251qskURpwLX2S5NSbpwP3hFg="; }; - packageJSON = ./package.json; + postPatch = '' + # Set a script name to avoid yargs using cli.js as $0 + substituteInPlace src/cli.js \ + --replace-fail '.demandCommand()' '.demandCommand().scriptName("gramma")' + ''; + offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-FuR6wUhAaej/vMgjAlICMEj1pPf+7PFrdu2lTFshIkg="; }; + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + passthru.updateScript = nix-update-script { }; meta = { description = "command-line grammar checker"; homepage = "https://caderek.github.io/gramma/"; - changelog = "https://github.com/caderek/gramma/releases/tag/v${version}"; + changelog = "https://github.com/caderek/gramma/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; mainProgram = "gramma"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix index 9c9454bf17..43a32eb4d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix @@ -38,17 +38,41 @@ buildGoModule rec { "cmd/granted" ]; - postInstall = '' - ln -s $out/bin/granted $out/bin/assumego + postInstall = + let + # assume depends on assumego, so we add (placeholder "out") to its path + addToAssumePath = lib.makeBinPath [ + xdg-utils + (placeholder "out") + ]; + in + '' + ln -s $out/bin/granted $out/bin/assumego - # Install shell script - install -Dm755 $src/scripts/assume $out/bin/assume - substituteInPlace $out/bin/assume \ - --replace /bin/bash ${bash}/bin/bash + # Create script with correct permissions + install -Dm755 /dev/null $out/bin/assume - wrapProgram $out/bin/assume \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + # assume is a script that must be sourced + # We can't wrap it because it inspects $0 and calls return, which can only + # be done in sourced scripts. + # So instead we insert the following snippet into the beginning of the + # script to add to PATH. + # This is borrowed from wrapProgram --suffix PATH : + addToPath="$(cat << 'EOF' + PATH=''${PATH:+':'$PATH':'} + if [[ $PATH != *':'''${addToAssumePath}''':'* ]]; then + PATH=$PATH'${addToAssumePath}' + fi + PATH=''${PATH#':'} + PATH=''${PATH%':'} + export PATH + + EOF + )" + + # Insert below the #!/bin/sh shebang + echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume '' + lib.optionalString withFish '' # Install fish script install -Dm755 $src/scripts/assume.fish $out/share/assume.fish diff --git a/third_party/nixpkgs/pkgs/by-name/gr/graphpython/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphpython/package.nix new file mode 100644 index 0000000000..f9c583d487 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/graphpython/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "graphpython"; + version = "1.0-unstable-2024-07-28"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mlcsec"; + repo = "Graphpython"; + # https://github.com/mlcsec/Graphpython/issues/1 + rev = "ee7dbda7fe881a9a207ca8661d42c505b8491ea3"; + hash = "sha256-64M/Cc49mlceY5roBVuSsDIcbDx+lrX6oSjPAu9YDwA="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + cryptography + dnspython + pyjwt + requests + tabulate + termcolor + tqdm + ]; + + pythonImportsCheck = [ "Graphpython" ]; + + # Project has no tests + doCheck = false; + + meta = { + description = "Microsoft Graph API (Entra, o365, and Intune) enumeration and exploitation toolkit"; + homepage = "https://github.com/mlcsec/Graphpython"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "graphpython"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gt/gtuber/package.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtuber/package.nix new file mode 100644 index 0000000000..71e504cb8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gt/gtuber/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + vala, + glib, + libsoup_3, + json-glib, + libxml2, + gst_all_1, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "gtuber"; + version = "0-unstable-2024-10-11"; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = "gtuber"; + rev = "468bf02a8adcf69b1bd6dd7b5dbcdcc0bfdb6922"; + hash = "sha256-pEiHqcxkrxZRD9xW/R9DNDdp5foxaHK2SAuzmPNegaY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection # For g-ir-scanner + vala # For vapigen + ]; + buildInputs = [ + glib + libsoup_3 + json-glib + libxml2 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + description = "GStreamer plugin for streaming videos from websites"; + homepage = "https://rafostar.github.io/gtuber/"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ chuangzhu ]; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gu/gucharmap/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/gucharmap/package.nix index c22eae1514..f6fd425d43 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/gucharmap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/gucharmap/package.nix @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "gucharmap"; - version = "15.1.5"; + version = "16.0.1"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "gucharmap"; rev = finalAttrs.version; - hash = "sha256-PG86D8QvqHdmo3aJseCerngmuWUqtSMdWzbixWE2HOQ="; + hash = "sha256-eQ27TIggwQ2RjDQO5ytVrUT7iNtbP5HOwMcpzweMW8A="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gw/gweled/package.nix b/third_party/nixpkgs/pkgs/by-name/gw/gweled/package.nix new file mode 100644 index 0000000000..5263d9adab --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gw/gweled/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchgit, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + desktop-file-utils, + clutter, + clutter-gtk, + gsound, + libgnome-games-support, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gweled"; + version = "1.0-beta1"; + + src = fetchgit { + url = "https://git.launchpad.net/gweled"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-cm1z6l2tfYBFVFcvsnQ6cI3pQDnJMzn6SUC20gnBF5w="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook3 + desktop-file-utils + ]; + + buildInputs = [ + clutter + clutter-gtk + gsound + libgnome-games-support + ]; + + configureFlags = [ "--disable-setgid" ]; + + meta = { + description = "Puzzle game similar to Bejeweled or Diamond Mine"; + mainProgram = "gweled"; + homepage = "https://gweled.org"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix b/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix index c7d5d81e36..5277ad263d 100644 --- a/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.13.0"; + version = "4.13.1"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-Cm4ww/QXTzRiSojeGtZ+CwAL2oSxKaTaTLiGkcNjxaE="; + hash = "sha256-pp05tcXFM2NqAPtOtsUprWyV6RE8MQoRSXyp56yELVI="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock index 6bbad68198..932ee1bdc8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock @@ -794,6 +794,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1012,6 +1021,7 @@ dependencies = [ "bytes", "chrono", "const_format", + "derive_more", "dirs-next", "flate2", "futures", @@ -1031,6 +1041,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "strum", "thiserror", "timeago", "tokio", @@ -1056,6 +1067,28 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 2.0.74", + "unicode-xid", +] + [[package]] name = "detect-desktop-environment" version = "0.2.0" @@ -1788,9 +1821,11 @@ dependencies = [ "palette", "rfd", "rodio", + "strum", "thiserror", "timeago", "tokio", + "tokio-stream", "unicode-segmentation", "uuid", "windows_exe_info", @@ -1836,6 +1871,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -2005,7 +2046,7 @@ dependencies = [ [[package]] name = "iced" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_core", "iced_futures", @@ -2019,7 +2060,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bitflags 2.6.0", "bytes", @@ -2038,7 +2079,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "futures", "iced_core", @@ -2052,7 +2093,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2073,7 +2114,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2085,7 +2126,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bytes", "iced_core", @@ -2097,7 +2138,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bytemuck", "cosmic-text", @@ -2112,7 +2153,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2131,7 +2172,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_renderer", "iced_runtime", @@ -2146,7 +2187,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_futures", "iced_graphics", @@ -3218,7 +3259,7 @@ version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ - "heck", + "heck 0.4.1", "itertools 0.12.1", "proc-macro2", "proc-macro2-diagnostics", @@ -3906,6 +3947,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + [[package]] name = "rustybuzz" version = "0.14.1" @@ -4312,6 +4359,28 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.74", +] + [[package]] name = "subtle" version = "2.6.1" @@ -4648,9 +4717,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", diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix index 04af62588d..2fc97ae6ad 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.11"; + version = "2024.12"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-kmdsC0SQoL5gppzBhnF0LfOFj14zeI3C6SdCBiVoKj0="; + hash = "sha256-NEm6qsU/Kes1rtNCsEauShpJZzrhBtOqo70uzrWpYtE="; }; cargoLock = { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "dpi-0.1.1" = "sha256-25sOvEBhlIaekTeWvy3UhjPI1xrJbOQvw/OkTg12kQY="; "glyphon-0.5.0" = "sha256-OGXLqiMjaZ7gR5ANkuCgkfn/I7c/4h9SRE6MZZMW3m4="; - "iced-0.13.0-dev" = "sha256-XQUaI16lGEMGFxqK3UNd8jQfUiBzomxlT/I+yeZncFo="; + "iced-0.13.0-dev" = "sha256-VXaE4+qXakYSyO5rcBbCe4QuJv/oguxdqUEbhXfmh2U="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix index 80abccbf14..ff4a6ba444 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.19.3"; + version = "2.20.5"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-Re0L+2P/Sxzj+fnuZi5uK2Hk72d8EvQGdjhglVbt41M="; + hash = "sha256-VGSSGc2caNO7+IK1ArqjZGz+LaHWZsaO68Jr06BCcfE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix index 5e8e4d76ee..c29ea891ff 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix @@ -6,20 +6,21 @@ libiconv, installShellFiles, nix-update-script, + stdenv, }: rustPlatform.buildRustPackage rec { pname = "handlr-regex"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Anomalocaridid"; repo = pname; rev = "v${version}"; - hash = "sha256-xYt+pntqfq1RwaLAoTIH6zaJZWgyl58I/2xWCWe+bBs="; + hash = "sha256-xjrETTBHqekdPn2NwpGVoRoU8mf0F4jZN2yt0k8ypRA="; }; - cargoHash = "sha256-w5eZm+wHx4aU6zsNZhg8mehDSzpd6k6PpV/V7tzukIA="; + cargoHash = "sha256-V/daNs2vk2N6N5eUq1haxxuNyGMBLLBSmBx0JozaN5A="; nativeBuildInputs = [ installShellFiles @@ -32,13 +33,13 @@ rustPlatform.buildRustPackage rec { export HOME=$TEMPDIR ''; - postInstall = '' - installShellCompletion \ - --zsh assets/completions/_handlr \ - --bash assets/completions/handlr \ - --fish assets/completions/handlr.fish + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd handlr \ + --zsh <(COMPLETE=zsh $out/bin/handlr) \ + --bash <(COMPLETE=bash $out/bin/handlr) \ + --fish <(COMPLETE=fish $out/bin/handlr) - installManPage assets/manual/man1/* + installManPage target/release-tmp/build/handlr-regex-*/out/manual/man1/* ''; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/harlequin/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/harlequin/package.nix index eb5c800110..ca41bb550b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/harlequin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/harlequin/package.nix @@ -11,14 +11,14 @@ }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "1.24.1"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; rev = "refs/tags/v${version}"; - hash = "sha256-3Rb47zkWsC6RJhk1btQc/kwxpFFWVnxY2PJooHB7IzQ="; + hash = "sha256-iRl91GqYigD6t0aVVShBg835yhlPxgfZcQCdAGUoc1k="; }; build-system = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hashes/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashes/package.nix new file mode 100644 index 0000000000..a1937d82f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/hashes/package.nix @@ -0,0 +1,73 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + adwaita-icon-theme, + gtk4, + libadwaita, + desktop-file-utils, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + cmake, + python3Packages, + appstream, + fetchPypi, + gobject-introspection, + glib, +}: + +python3Packages.buildPythonApplication rec { + pname = "hashes"; + version = "1.1.0"; + + pyproject = false; + + src = fetchFromGitHub { + owner = "zefr0x"; + repo = "hashes"; + rev = "refs/tags/v${version}"; + hash = "sha256-BmfSCHs+JcpsAG8AhaYf+SDFI+LdJKMKgBIodd66qmw="; + }; + + nativeBuildInputs = [ + meson + ninja + desktop-file-utils + cmake + pkg-config + appstream + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + glib + adwaita-icon-theme + ]; + + dependencies = with python3Packages; [ + name-that-hash + pygobject3 + ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/zefr0x/hashes/tree/main"; + changelog = "https://github.com/zefr0x/hashes/releases/tag/v${version}"; + description = "Simple hash algorithm identification GUI"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.gpl3Plus; + mainProgram = "hashes"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/hi/highs/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/highs/package.nix index 75afbbdfa4..836e947706 100644 --- a/third_party/nixpkgs/pkgs/by-name/hi/highs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hi/highs/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highs"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - hash = "sha256-q18TfKbZyTZzzPZ8z3U57Yt8q2PSvbkg3qqqiPMgy5Q="; + hash = "sha256-3ACo6V6Y99XPe4dvurWflNGPjHy3irURv4jYHMrgSms="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix index 34892c8a38..0b8e16ced6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix @@ -18,14 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-09-26"; + version = "0-unstable-2024-10-20"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "ffe2d07e771580a005e675108212597e5b367d2d"; - hash = "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs="; + rev = "fe56302339bb28e3471632379d733547caec8103"; + hash = "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix index a0bb01845f..c24e35ba11 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix @@ -38,7 +38,7 @@ buildGo123Module { pnpmDeps = pnpm.fetchDeps { inherit pname version; src = "${src}/frontend"; - hash = "sha256-SyKET+W9Fn1WETzF4KlAtLOzNI/DOavHUbC7Yfv6kFw="; + hash = "sha256-fOb3oboNlOv/TpIrs3BsSlxIqNbbtSCE8zLMia2RIDw="; }; pnpmRoot = "../frontend"; diff --git a/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix index 05b943a396..42e2395299 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix @@ -2,16 +2,24 @@ appimageTools, lib, fetchurl, + stdenv, }: appimageTools.wrapType2 rec { pname = "httpie-desktop"; version = "2024.1.2"; - src = fetchurl { - url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage"; - hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; - }; + src = + if stdenv.hostPlatform.system == "aarch64-linux" then + fetchurl { + url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}-arm64.AppImage"; + hash = "sha256-RhIyLakCkMUcXvu0sgl5MtV4YXXkqqH1UUS7bptUzww="; + } + else + fetchurl { + url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage"; + hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; + }; extraInstallCommands = let @@ -32,6 +40,9 @@ appimageTools.wrapType2 rec { license = licenses.unfree; maintainers = with maintainers; [ luftmensch-luftmensch ]; mainProgram = "httpie-desktop"; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix index e0c0eb3f7e..f0ea46e36b 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprdim"; - version = "2.2.6"; + version = "3.0.0"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprdim"; rev = version; - hash = "sha256-zE1GYgS3fFO6Zz1I5zr+ApEux9ndKOeegj2n/rF/4HY="; + hash = "sha256-+nzIDtRLVA6CgCtbyeR+TU5euSZQb7wi2187IxLrAmQ="; }; - cargoHash = "sha256-WchQXRlU/fkjnCOeP9E5JXVdM8UZlG3ixfLGHvmezHg="; + cargoHash = "sha256-UhlwVZ70t6CSQ4ZoXk0OdUqEVeOVMp+TmOSX5iyNNVI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix index 9eea79c6b4..1c0a2225ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix @@ -1,25 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wayland -, wayland-protocols -, wayland-scanner -, hyprlang -, sdbus-cpp -, systemd +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + hyprutils, + wayland, + wayland-protocols, + wayland-scanner, + hyprlang, + sdbus-cpp_2, + systemd, }: stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII="; + hash = "sha256-20a3pg94dyLFflbBIN+EYJ04nWfWldTfd2YmB/rcrqY="; }; nativeBuildInputs = [ @@ -30,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprlang - sdbus-cpp + hyprutils + sdbus-cpp_2 systemd wayland wayland-protocols @@ -42,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ iogamaster ]; mainProgram = "hypridle"; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix index ac691786cd..7a744ea144 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix @@ -9,6 +9,8 @@ hyprlang, hyprutils, pam, + sdbus-cpp_2, + systemdLibs, wayland, wayland-protocols, wayland-scanner, @@ -24,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8="; + hash = "sha256-sUIsjWpZLplSJXWyJcDZdvDweksXLH5r9GSkwg0kgBw="; }; strictDeps = true; @@ -54,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: { mesa pam pango + sdbus-cpp_2 + systemdLibs wayland wayland-protocols ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix b/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix index a55201ae0a..0a8c9fd3b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ice-bar"; - version = "0.11.9"; + version = "0.11.11"; src = fetchurl { url = "https://github.com/jordanbaird/Ice/releases/download/${finalAttrs.version}/Ice.zip"; - hash = "sha256-nC7gIF4OdkUYoacbyr1cv5xpJkWDqhFW11UNZvgrQtE="; + hash = "sha256-Iepf+mFN7ym7aZu3xnJVJoQNDZmSFvt15QTGdXtvScs="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix b/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix index 55283031e7..2e4ad286a1 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix @@ -2,7 +2,9 @@ lib, stdenv, cmake, - llvm, + darwin, + fetchpatch, + llvmPackages_17, fetchFromGitHub, mbedtls, gtk3, @@ -21,13 +23,24 @@ nlohmann_json, yara, rsync, + nix-update-script, autoPatchelfHook, + makeWrapper, + overrideSDK, }: let version = "1.35.4"; patterns_version = "1.35.4"; + llvmPackages = llvmPackages_17; + + stdenv' = + let + baseStdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + in + if stdenv.isDarwin then overrideSDK baseStdenv "11.0" else baseStdenv; + patterns_src = fetchFromGitHub { name = "ImHex-Patterns-source-${patterns_version}"; owner = "WerWolv"; @@ -37,7 +50,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { pname = "imhex"; inherit version; @@ -46,20 +59,39 @@ stdenv.mkDerivation rec { fetchSubmodules = true; owner = "WerWolv"; repo = "ImHex"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-6QpmFkSMQpGlEzo7BHZn20c+q8CTDUB4yO87wMU5JT4="; }; - nativeBuildInputs = [ - autoPatchelfHook - cmake - llvm - python3 - perl - pkg-config - rsync + patches = [ + # https://github.com/WerWolv/ImHex/pull/1910 + # during https://github.com/NixOS/nixpkgs/pull/330303 it was discovered that ImHex + # would not build on Darwin x86-64 + # this temporary patch can be removed when the above PR is merged + (fetchpatch { + url = "https://github.com/WerWolv/ImHex/commit/69624a2661ea44db9fb8b81c3278ef69016ebfcf.patch"; + hash = "sha256-LcUCl8Rfz6cbhop2StksuViim2bH4ma3/8tGVKFdAgg="; + }) ]; + # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/PostprocessBundle.cmake \ + --replace-fail "fixup_bundle" "#fixup_bundle" + ''; + + nativeBuildInputs = + [ + cmake + llvmPackages.llvm + python3 + perl + pkg-config + rsync + ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + buildInputs = [ capstone curl @@ -73,31 +105,50 @@ stdenv.mkDerivation rec { mbedtls nlohmann_json yara - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.UniformTypeIdentifiers ]; # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib # however, we will append to RUNPATH ourselves - autoPatchelfIgnoreMissingDeps = [ "*.hexpluglib" ]; - appendRunpaths = [ + autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ "*.hexpluglib" ]; + appendRunpaths = lib.optionals stdenv.isLinux [ (lib.makeLibraryPath [ libGL ]) "${placeholder "out"}/lib/imhex/plugins" ]; cmakeFlags = [ - "-DIMHEX_OFFLINE_BUILD=ON" - "-DUSE_SYSTEM_CAPSTONE=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_FMT=ON" - "-DUSE_SYSTEM_LLVM=ON" - "-DUSE_SYSTEM_NLOHMANN_JSON=ON" - "-DUSE_SYSTEM_YARA=ON" + (lib.cmakeBool "IMHEX_OFFLINE_BUILD" true) + (lib.cmakeBool "IMHEX_COMPRESS_DEBUG_INFO" false) # avoids error: cannot compress debug sections (zstd not enabled) + (lib.cmakeBool "IMHEX_GENERATE_PACKAGE" stdenv.isDarwin) + (lib.cmakeBool "USE_SYSTEM_CAPSTONE" true) + (lib.cmakeBool "USE_SYSTEM_CURL" true) + (lib.cmakeBool "USE_SYSTEM_FMT" true) + (lib.cmakeBool "USE_SYSTEM_LLVM" true) + (lib.cmakeBool "USE_SYSTEM_NLOHMANN_JSON" true) + (lib.cmakeBool "USE_SYSTEM_YARA" true) ]; # rsync is used here so we can not copy the _schema.json files - postInstall = '' - mkdir -p $out/share/imhex - rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,patterns} $out/share/imhex - ''; + postInstall = + if stdenv.isLinux then + '' + mkdir -p $out/share/imhex + rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} $out/share/imhex + '' + else if stdenv.isDarwin then + '' + mkdir -p $out/Applications + mv $out/imhex.app $out/Applications + rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} "$out/Applications/imhex.app/Contents/MacOS" + install_name_tool \ + -change "$out/lib/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \ + "@executable_path/../Frameworks/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \ + "$out/Applications/imhex.app/Contents/MacOS/imhex" + makeWrapper "$out/Applications/imhex.app/Contents/MacOS/imhex" "$out/bin/imhex" + '' + else + throw "Unsupported system"; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; @@ -107,6 +158,6 @@ stdenv.mkDerivation rec { kashw2 cafkafk ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich-go/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich-go/package.nix index a68b155a6a..9e996b621a 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich-go/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immich-go/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-dSyVn7CQqZ/tCxF/Yl12eubWkZrV5FM8uRexCjZILbw="; + hash = "sha256-6bLjHKkEghbY+UQFrgbfeHwOjtks1HjXbDXEr7DuJbU="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json index fb2e715428..b39c08613c 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.118.1", - "hash": "sha256-rWBW0EwehuWnKk6qEte+dPd9l7FbLzwdkCSKMm22Orw=", + "version": "1.118.2", + "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=", "components": { "cli": { - "npmDepsHash": "sha256-0je82BtDH6cUzoMrmeIS0jLmWPbmkdIQJ/SnmbAMtbw=", - "version": "2.2.25" + "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=", + "version": "2.2.26" }, "server": { - "npmDepsHash": "sha256-Jxb47Y4x9A6s4zGODIp6rze7iQ/w8Gvt31NHSATLYCM=", - "version": "1.118.1" + "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=", + "version": "1.118.2" }, "web": { - "npmDepsHash": "sha256-BUgkdsC6raURkyy6eN31uCMKmBbL+fCbGabfHJgJn8g=", - "version": "1.118.1" + "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=", + "version": "1.118.2" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-Ga/aU5hojd3SgtoiM5QLsmzS5k7CRvh13a4lkC0BZA8=", - "version": "1.118.1" + "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=", + "version": "1.118.2" } } } diff --git a/third_party/nixpkgs/pkgs/by-name/in/inspector/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inspector/package.nix new file mode 100644 index 0000000000..c9d0957f72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/in/inspector/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + gettext, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + libadwaita, + python3Packages, + iproute2, + util-linux, + coreutils, + usbutils, + pciutils, +}: + +python3Packages.buildPythonApplication rec { + pname = "inspector"; + version = "0.2.0"; + format = "other"; + + src = fetchFromGitHub { + owner = "Nokse22"; + repo = "inspector"; + rev = "v${version}"; + hash = "sha256-tjQCF2Tyv7/NWgrwHu+JPpnLECfDmQS77EVLBt+cRTs="; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + wrapGAppsHook4 + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + libadwaita + ]; + + dependencies = [ + python3Packages.pygobject3 + iproute2 + util-linux + coreutils + usbutils + pciutils + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/Nokse22/inspector"; + description = "Gtk4 Libadwaita wrapper for various system info cli commands"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + platforms = lib.platforms.linux; + mainProgram = "inspector"; + maintainers = with lib.maintainers; [ mksafavi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff b/third_party/nixpkgs/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff index 0bf0a9bd61..9bf9f89dde 100644 --- a/third_party/nixpkgs/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff +++ b/third_party/nixpkgs/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff @@ -35,10 +35,10 @@ diff -Naur cron-old/pathnames.h cron-new/pathnames.h +#define _PATH_SENDMAIL "@sendmailPath@" + +#undef _PATH_VI -+#define _PATH_VI "@VIPATH@" ++#define _PATH_VI "@viPath@" + +#undef _PATH_DEFPATH -+#define _PATH_DEFPATH "@DEFPATH@" ++#define _PATH_DEFPATH "@defPath@" + +/* Nixpkgs-specific patch end */ + diff --git a/third_party/nixpkgs/pkgs/by-name/is/isc-cron/package.nix b/third_party/nixpkgs/pkgs/by-name/is/isc-cron/package.nix index b52086fca4..61633c6c9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/is/isc-cron/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/is/isc-cron/package.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { (substituteAll { src = ./0000-nixpkgs-specific.diff; inherit sendmailPath; - VIPATH = lib.getExe' vim "vim"; - DEFPATH = lib.concatStringsSep ":" [ + viPath = lib.getExe' vim "vim"; + defPath = lib.concatStringsSep ":" [ "/run/wrappers/bin" "/nix/var/nix/profiles/default/bin" "/run/current-system/sw/bin" diff --git a/third_party/nixpkgs/pkgs/by-name/jo/joe/macos-fix.patch b/third_party/nixpkgs/pkgs/by-name/jo/joe/macos-fix.patch new file mode 100644 index 0000000000..ff6ef95846 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/jo/joe/macos-fix.patch @@ -0,0 +1,13 @@ +diff -Naru i/joe/tty.c w/joe/tty.c +--- ./joe/tty.c 2018-01-10 17:28:34 ++++ ../joe-i-4.6/joe/tty.c 2024-10-02 14:08:22 +@@ -6,6 +6,9 @@ + * This file is part of JOE (Joe's Own Editor) + */ + #include "types.h" ++#if defined(__APPLE__) && defined(__MACH__) ++#include ++#endif + + /* Needed for TIOCGWINSZ detection below */ + #ifdef GWINSZ_IN_SYS_IOCTL diff --git a/third_party/nixpkgs/pkgs/by-name/jo/joe/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/joe/package.nix index 9059fe69bd..245f8b13ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/joe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/joe/package.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; }; + patches = [ ./macos-fix.patch ]; + meta = with lib; { description = "Full featured terminal-based screen editor"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ju/junest/package.nix b/third_party/nixpkgs/pkgs/by-name/ju/junest/package.nix index 2890f34596..10f59b82ad 100644 --- a/third_party/nixpkgs/pkgs/by-name/ju/junest/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ju/junest/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "junest"; - version = "7.4.9"; + version = "7.4.10"; src = fetchFromGitHub { owner = "fsquillace"; repo = "junest"; rev = "refs/tags/${version}"; - hash = "sha256-iPZN4zPHRsOh5GjRUbeEQj7BYO2Ng93mNn8TvxpDN3Q="; + hash = "sha256-Dq4EqmeFI1TEbnc4kQwgqe71eJJpzWm2ywt1y6fD8z4="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kamp/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kamp/package.nix new file mode 100644 index 0000000000..9545272130 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ka/kamp/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "kamp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "vbauerster"; + repo = pname; + rev = "v${version}"; + hash = "sha256-9cakFhA9niMZ0jD0ilgCUztk4uL6wDp6zfHUJY/yLYw="; + }; + + cargoHash = "sha256-BnVV0UnXEebq1kbQvv8PkmntLK0BwrOcMxxIODpZrxc="; + + postInstall = '' + install scripts/* -Dt $out/bin + ''; + + meta = { + description = "Tool to control Kakoune editor from the command line"; + homepage = "https://github.com/vbauerster/kamp"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ erikeah ]; + mainProgram = "kamp"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix index cfa9e43ba7..c2972b0778 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix @@ -131,6 +131,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kanidm/kanidm"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens erictapen Flakebi ]; + maintainers = with maintainers; [ adamcstephens Flakebi ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix index 89789a0d89..8aef49b4d2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kara"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "dhruv8sh"; repo = "kara"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-G+sLHcHnNuzIRE+6bvEeXaWYVdoqqxcp5kGF8ZhD/34="; + hash = "sha256-an0tA1YQU/wpaY4y6lQfOFiUYm6aLmVTC1M5sukARVA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix index 100c892f39..12a8c59356 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; + hash = "sha256-qIaDc10NxQKBH7WRzzkQ6bQfkSqsDrFxSwSX+Hf7qS8="; }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-2694O2q6UbNySgn76aBTjdqt2Hh1GrdRaro064fGBrI="; + cargoHash = "sha256-mB4qOUj9qZmbstvBIyaWHEzX3DQ7tLhQKDEvea4Bnyk="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm rustc ] ++ ( diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keymapp/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keymapp/package.nix index 5438236d1a..632f829f97 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keymapp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keymapp/package.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-9umi9QWWSG0W3w9d7eRwtZHUraqInkqJbE+Lkdn3TU8="; + hash = "sha256-KJZ6KlsMmKal4gRzDKh7E8fulphCx2eviJMiyypbagY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kid3/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix rename to third_party/nixpkgs/pkgs/by-name/ki/kid3/package.nix index 8cc6f6d8ec..8403db5c9f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ki/kid3/package.nix @@ -1,47 +1,44 @@ -{ chromaprint -, cmake -, docbook_xml_dtd_45 -, docbook_xsl -, fetchurl -, ffmpeg -, flac -, id3lib -, kdePackages -, lib -, libogg -, libvorbis -, libxslt -, mp4v2 -, pkg-config -, python3 -, qtbase -, qtdeclarative -, qtmultimedia -, qttools -, readline -, stdenv -, taglib -, wrapQtAppsHook -, zlib -, withCLI ? true -, withKDE ? true -, withQt ? false +{ + lib, + chromaprint, + cmake, + docbook_xml_dtd_45, + docbook_xsl, + fetchurl, + ffmpeg, + flac, + id3lib, + kdePackages, + libogg, + libvorbis, + libxslt, + mp4v2, + pkg-config, + python3, + qt6, + readline, + stdenv, + taglib, + zlib, + # Boolean flags + withCLI ? true, + withKDE ? true, + withQt ? false, }: let - inherit (lib) optionals; + inherit (qt6) + qtbase + qtdeclarative + qtmultimedia + qttools + wrapQtAppsHook + ; apps = lib.concatStringsSep ";" ( - optionals withCLI [ "CLI" ] - ++ optionals withKDE [ "KDE" ] - ++ optionals withQt [ "Qt" ] + lib.optionals withCLI [ "CLI" ] ++ lib.optionals withKDE [ "KDE" ] ++ lib.optionals withQt [ "Qt" ] ); - mainProgram = - if withQt then "kid3-qt" - else if withKDE then "kid3" - else "kid3-cli"; - in stdenv.mkDerivation (finalAttrs: { pname = "kid3"; @@ -62,29 +59,34 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - chromaprint - ffmpeg - flac - id3lib - libogg - libvorbis - libxslt - mp4v2 - qtbase - qtdeclarative - qtmultimedia - readline - taglib - zlib - ] ++ lib.optionals withKDE (with kdePackages; [ - kconfig - kconfigwidgets - kcoreaddons - kio - kxmlgui - phonon - ]); + buildInputs = + [ + chromaprint + ffmpeg + flac + id3lib + libogg + libvorbis + libxslt + mp4v2 + qtbase + qtdeclarative + qtmultimedia + readline + taglib + zlib + ] + ++ lib.optionals withKDE ( + with kdePackages; + [ + kconfig + kconfigwidgets + kcoreaddons + kio + kxmlgui + phonon + ] + ); cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ]; @@ -95,10 +97,8 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Simple and powerful audio tag editor"; - inherit mainProgram; homepage = "https://kid3.kde.org/"; - license = lib.licenses.lgpl2Plus; + description = "Simple and powerful audio tag editor"; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full @@ -128,6 +128,14 @@ stdenv.mkDerivation (finalAttrs: { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; + license = lib.licenses.lgpl2Plus; + mainProgram = + if withQt then + "kid3-qt" + else if withKDE then + "kid3" + else + "kid3-cli"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/Cargo.lock deleted file mode 100644 index c15c9b2d36..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/Cargo.lock +++ /dev/null @@ -1,5804 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 1.13.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling", - "rustix 0.37.25", - "slab", - "socket2 0.4.9", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io", - "async-lock", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.0.0", - "futures-lite 1.13.0", - "rustix 0.38.19", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "async-signal" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.19", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.1.2", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -dependencies = [ - "serde", -] - -[[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" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "fastrand 2.0.1", - "futures-io", - "futures-lite 1.13.0", - "piper", - "tracing", -] - -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bson" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58da0ae1e701ea752cc46c1bb9f39d5ecefc7395c3ecd526261a566d4f16e0c2" -dependencies = [ - "ahash", - "base64 0.13.1", - "bitvec", - "hex", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "time", - "uuid", -] - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-order" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021a13e4bf34a5679ada4609a01337ae82f2c4c97493b9d8cbf8aa9af9bd0f4" - -[[package]] -name = "byte-unit" -version = "4.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" -dependencies = [ - "serde", - "utf8-width", -] - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -dependencies = [ - "serde", -] - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.1.2", -] - -[[package]] -name = "cargo_toml" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfb-mode" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" -dependencies = [ - "cipher", -] - -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-expr" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets 0.48.5", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.23.1", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-oid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[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 = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.38", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.38", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.1", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "diesel" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33" -dependencies = [ - "diesel_derives", - "libsqlite3-sys", - "r2d2", - "serde_json", - "time", -] - -[[package]] -name = "diesel_derives" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" -dependencies = [ - "diesel_table_macro_syntax", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "diesel_migrations" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" -dependencies = [ - "syn 2.0.38", -] - -[[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", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "easy-ext" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49457524c7e65648794c98283282a0b7c73b10018e7091f1cdcfff314fd7ae59" - -[[package]] -name = "embed-resource" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" -dependencies = [ - "cc", - "rustc_version", - "toml 0.8.2", - "vswhom", - "winreg 0.51.0", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enumflags2" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "extend" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311a6d2f1f9d60bff73d2c78a0af97ed27f79672f15c238192a5bbb64db56d00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "fastrand" -version = "1.9.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" - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "log", -] - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.0", - "rustc_version", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "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.38", -] - -[[package]] -name = "foreign-types-shared" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-executor" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" -dependencies = [ - "fastrand 2.0.1", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-loco-protocol" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e01bd62aeea8e91616b5036ebfeba7a33ccbc7cf192e29494f9147e2aba147" -dependencies = [ - "flume", - "futures-core", - "futures-io", - "getrandom 0.2.10", - "loco-protocol", - "nohash-hasher", - "oneshot", - "pin-project-lite", - "rand 0.8.5", -] - -[[package]] -name = "futures-macro" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.1.2", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.1.2", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.1.2", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.1.2", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[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 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.1.2", - "winapi", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.1.2", -] - -[[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 = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.1.2", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.1.2", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" - -[[package]] -name = "headless-talk" -version = "0.6.1" -dependencies = [ - "arrayvec", - "bson", - "diesel", - "diesel_migrations", - "extend", - "futures", - "futures-loco-protocol", - "libsqlite3-sys", - "log", - "nohash-hasher", - "once_cell", - "r2d2", - "serde", - "serde_json", - "talk-loco-client", - "thiserror", - "tokio", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever 0.11.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.9", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.9", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.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 = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.1", - "serde", -] - -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[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.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "javascriptcore-rs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" -dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "treediff", -] - -[[package]] -name = "kiwi-talk-api" -version = "0.5.1" -dependencies = [ - "anyhow", - "bincode", - "easy-ext", - "hex", - "kiwi-talk-result", - "kiwi-talk-system", - "parking_lot", - "reqwest", - "serde", - "serde-byte-array", - "sha2", - "talk-api-internal", - "tauri", - "tokio", -] - -[[package]] -name = "kiwi-talk-app" -version = "0.5.1" -dependencies = [ - "anyhow", - "kiwi-talk-api", - "kiwi-talk-client", - "kiwi-talk-result", - "kiwi-talk-system", - "log", - "serde", - "serde_json", - "talk-loco-client", - "tauri", - "tauri-build", - "tauri-plugin-log", - "tauri-plugin-single-instance", - "tauri-plugin-window-state", - "tokio", - "window-shadows", - "window-vibrancy", -] - -[[package]] -name = "kiwi-talk-client" -version = "0.5.1" -dependencies = [ - "anyhow", - "arrayvec", - "futures", - "headless-talk", - "hex", - "kiwi-talk-api", - "kiwi-talk-resource", - "kiwi-talk-result", - "kiwi-talk-system", - "log", - "num-bigint-dig", - "once_cell", - "parking_lot", - "serde", - "sha2", - "talk-loco-client", - "tauri", - "tokio", - "tokio-util", -] - -[[package]] -name = "kiwi-talk-resource" -version = "0.5.1" -dependencies = [ - "anyhow", - "dashmap", - "serde", -] - -[[package]] -name = "kiwi-talk-result" -version = "0.5.1" -dependencies = [ - "anyhow", - "serde", -] - -[[package]] -name = "kiwi-talk-system" -version = "0.5.1" -dependencies = [ - "anyhow", - "base64 0.21.5", - "hostname", - "log", - "rand 0.8.5", - "sys-locale 0.3.1", - "tauri", - "tokio", -] - -[[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]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever 0.26.0", - "indexmap 1.9.3", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "libappindicator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "loco-protocol" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c023996a61dd3fcefe0c1f4d96c91795cc825b95d7fa41728a5b3dcafb8fa729" -dependencies = [ - "aes", - "arrayvec", - "bincode", - "byte-order", - "cfb-mode", - "getrandom 0.2.10", - "rand 0.8.5", - "rsa", - "serde", - "sha1", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "pin-utils", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mac-notification-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "migrations_internals" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "migrations_macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.10", -] - -[[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 = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "notify-rust" -version = "4.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7b75c8958cb2eab3451538b32db8a7b74006abc33eb2e6a9a56d21e4775c2b" -dependencies = [ - "log", - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oneshot" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4" -dependencies = [ - "loom", -] - -[[package]] -name = "open" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] - -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types 0.3.2", - "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 2.0.38", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_info" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags 1.3.2", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.1.2", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "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 = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.1", - "futures-io", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plist" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" -dependencies = [ - "base64 0.21.5", - "indexmap 1.9.3", - "line-wrap", - "quick-xml 0.29.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot", - "scheduled-thread-pool", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "base64 0.21.5", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static", - "log", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", -] - -[[package]] -name = "rsa" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" -dependencies = [ - "byteorder", - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" -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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -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" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.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 = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.192" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-byte-array" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63213ee4ed648dbd87db6fa993d4275b46bfb4ddfd95b3756045007c2b28f742" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.192" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "indexmap 2.0.2", - "itoa 1.0.9", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.9", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" -dependencies = [ - "base64 0.21.5", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.0.2", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "soup2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" -dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags 1.3.2", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "structstruck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a052ec87a2d9bdd3a35f85ec6a07a5ac0816e4190b1cbede9d67cccb47ea66d" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "venial", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sys-locale" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" -dependencies = [ - "js-sys", - "libc", - "wasm-bindgen", - "web-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.11", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" -dependencies = [ - "cfg-expr 0.15.5", - "heck 0.4.1", - "pkg-config", - "toml 0.8.2", - "version-compare 0.1.1", -] - -[[package]] -name = "talk-api-internal" -version = "0.4.1" -dependencies = [ - "hex", - "reqwest", - "serde", - "serde_json", - "serde_with", - "sha2", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "talk-loco-client" -version = "0.6.1" -dependencies = [ - "async-stream", - "bitflags 2.4.1", - "bson", - "futures-lite 2.0.1", - "futures-loco-protocol", - "num-bigint-dig", - "parking_lot", - "pin-project-lite", - "serde", - "serde-byte-array", - "serde_with", - "structstruck", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-util", -] - -[[package]] -name = "tao" -version = "0.16.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b768eb5cf657b045d03304b1f60ecb54eac8b520f393c4f4240a94111a1caa17" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "cc", - "cocoa 0.24.1", - "core-foundation", - "core-graphics 0.22.3", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image", - "instant", - "jni", - "lazy_static", - "libappindicator", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "serde", - "tao-macros", - "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement", - "x11-dl", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - -[[package]] -name = "tauri" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9" -dependencies = [ - "anyhow", - "base64 0.21.5", - "bytes", - "cocoa 0.24.1", - "dirs-next", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "glib", - "glob", - "gtk", - "heck 0.4.1", - "http", - "ignore", - "minisign-verify", - "notify-rust", - "objc", - "once_cell", - "open", - "os_info", - "os_pipe", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "reqwest", - "rfd", - "semver", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "shared_child", - "state", - "sys-locale 0.2.4", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "time", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "zip", -] - -[[package]] -name = "tauri-build" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "heck 0.4.1", - "json-patch", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" -dependencies = [ - "base64 0.21.5", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "regex", - "semver", - "serde", - "serde_json", - "sha2", - "tauri-utils", - "thiserror", - "time", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin-log" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#8d6045421a553330e9da8b9e1e4405d419c5ea88" -dependencies = [ - "byte-unit", - "fern", - "log", - "serde", - "serde_json", - "serde_repr", - "tauri", - "time", -] - -[[package]] -name = "tauri-plugin-single-instance" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#8d6045421a553330e9da8b9e1e4405d419c5ea88" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "windows-sys 0.48.0", - "zbus", -] - -[[package]] -name = "tauri-plugin-window-state" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#8d6045421a553330e9da8b9e1e4405d419c5ea88" -dependencies = [ - "bincode", - "bitflags 2.4.1", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-runtime" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" -dependencies = [ - "gtk", - "http", - "http-range", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "uuid", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895" -dependencies = [ - "cocoa 0.24.1", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46" -dependencies = [ - "brotli", - "ctor", - "dunce", - "glob", - "heck 0.4.1", - "html5ever 0.26.0", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows 0.39.0", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" -dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", -] - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.19", - "windows-sys 0.48.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa 1.0.9", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.4", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.2", -] - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" -dependencies = [ - "tempfile", - "winapi", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -dependencies = [ - "getrandom 0.2.10", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "venial" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -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 2.0.38", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[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 2.0.38", - "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 = "wasm-streams" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.1.2", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window-shadows" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08" -dependencies = [ - "cocoa 0.25.0", - "objc", - "raw-window-handle", - "windows-sys 0.48.0", -] - -[[package]] -name = "window-vibrancy" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5931735e675b972fada30c7a402915d4d827aa5ef6c929c133d640c4b785e963" -dependencies = [ - "cocoa 0.25.0", - "objc", - "raw-window-handle", - "windows-sys 0.48.0", -] - -[[package]] -name = "windows" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" -dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.109", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[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.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wry" -version = "0.24.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" -dependencies = [ - "base64 0.13.1", - "block", - "cocoa 0.24.1", - "core-graphics 0.22.3", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever 0.25.2", - "http", - "kuchiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2", - "soup2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix", - "winapi", -] - -[[package]] -name = "zbus" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", -] - -[[package]] -name = "zvariant" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix deleted file mode 100644 index 74639a6fbb..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, rustc -, rustPlatform -, cargo -, cargo-tauri -, desktop-file-utils -, openssl -, libayatana-appindicator -, webkitgtk_4_0 -, pkg-config -, pnpm -, nodejs -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kiwitalk"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "KiwiTalk"; - repo = "KiwiTalk"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Th8q+Zbc102fIk2v7O3OOeSriUV/ydz60QwxzmS7AY8="; - }; - - postPatch = '' - substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ - --replace-warn "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - hash = "sha256-gf3vmKUta8KksUOxyhQS4UO6ycAJDfEicyXVGMW8+4c="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "tauri-plugin-log-0.0.0" = "sha256-8BrFf7vheMJIaZD0oXpi8V4hmUJFzHJmkcRtPL1/J48="; - "tauri-plugin-single-instance-0.0.0" = "sha256-8BrFf7vheMJIaZD0oXpi8V4hmUJFzHJmkcRtPL1/J48="; - }; - }; - - nativeBuildInputs = [ - rustPlatform.cargoSetupHook - cargo - rustc - cargo-tauri.hook - desktop-file-utils - nodejs - pnpm.configHook - pkg-config - ]; - - buildInputs = [ - openssl - libayatana-appindicator - webkitgtk_4_0 - ]; - - postInstall = lib.optionalString stdenv.isLinux '' - desktop-file-edit \ - --set-comment "An UNOFFICIAL cross-platform KakaoTalk client" \ - --set-key="Categories" --set-value="Network;InstantMessaging;" \ - $out/share/applications/kiwi-talk.desktop - ''; - - meta = with lib; { - description = "UNOFFICIAL cross-platform KakaoTalk client written in TypeScript & Rust (SolidJS, tauri)"; - homepage = "https://github.com/KiwiTalk/KiwiTalk"; - maintainers = with maintainers; [ honnip ]; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - mainProgram = "kiwi-talk"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix index 3e5186ec48..bb0da2db7a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix @@ -1,14 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, openssl -, rustPlatform -, darwin -, testers -, komac -, dbus -, zstd +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + openssl, + rustPlatform, + darwin, + testers, + komac, + dbus, + zstd, + versionCheckHook, + nix-update-script, }: let @@ -16,7 +19,7 @@ let src = fetchFromGitHub { owner = "russellbanks"; repo = "Komac"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-YFaa2kU42NlhRivBEPV1mSr3j95P4NFwUKM0Xx8tpfg="; }; in @@ -29,14 +32,16 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - dbus - openssl - zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = + [ + dbus + openssl + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; env = { OPENSSL_NO_VENDOR = true; @@ -44,19 +49,30 @@ rustPlatform.buildRustPackage { ZSTD_SYS_USE_PKG_CONFIG = true; }; - passthru.tests.version = testers.testVersion { - inherit version; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/komac"; - package = komac; - command = "komac --version"; + passthru = { + tests.version = testers.testVersion { + inherit version; + + package = komac; + command = "komac --version"; + }; + + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Community Manifest Creator for WinGet"; homepage = "https://github.com/russellbanks/Komac"; changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kachick HeitorAugustoLN ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + kachick + HeitorAugustoLN + ]; mainProgram = "komac"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubent/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix rename to third_party/nixpkgs/pkgs/by-name/ku/kubent/package.nix index 75f4244ee1..c49a009402 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ku/kubent/package.nix @@ -1,20 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, kubent }: +{ + buildGoModule, + fetchFromGitHub, + kubent, + lib, + testers, +}: buildGoModule rec { pname = "kubent"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = version; - sha256 = "sha256-/gCbj0RDwV5E8kNkEu+37ilzw/A0BAXiYfHGPdkCsRs="; + hash = "sha256-7bn7DxbZ/Nqob7ZEWRy1UVg97FiJN5JWEgpH1CDz6jQ="; }; - vendorHash = "sha256-6hp7mzE45Tlmt4ybhpdJLYCv+WqQ9ak2S47kJTwyGVI="; + vendorHash = "sha256-+V+/TK60V8NYUDfF5/EgSZg4CLBn6Mt57diiyXm179k="; ldflags = [ - "-w" "-s" + "-w" + "-s" "-X main.version=v${version}" ]; @@ -26,11 +33,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { - homepage = "https://github.com/doitintl/kube-no-trouble"; + meta = { description = "Easily check your cluster for use of deprecated APIs"; + changelog = "https://github.com/doitintl/kube-no-trouble/releases/tag/${version}"; + homepage = "https://github.com/doitintl/kube-no-trouble"; + license = lib.licenses.mit; mainProgram = "kubent"; - license = licenses.mit; - maintainers = with maintainers; [ peterromfeldhk ]; + maintainers = with lib.maintainers; [ peterromfeldhk ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 59e3da8c08..fdf4420f1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2024-09-30"; + version = "0-unstable-2024-10-20"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "19ae222b6bab778d0f8a900d39c25ab020e33631"; - hash = "sha256-coA8gU2AKeHs6OENxBWholk5sEL/oketxNFLd8M1kTM="; + rev = "c3f83aabb6dca20fd3c2304db15da2e68d027d3e"; + hash = "sha256-1gzo9KMDHg5ZFMo5CpP36A5tomr2DFoU8UEwx7ik5F8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lazpaint/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix rename to third_party/nixpkgs/pkgs/by-name/la/lazpaint/package.nix index 18f4e8de7f..6c9d1149a1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lazpaint/package.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, python3 -, makeWrapper +{ + lib, + stdenv, + fetchFromGitHub, + lazarus-qt, + fpc, + autoPatchelfHook, + libsForQt5, + libqt5pas, + xorg, + python3, }: let @@ -16,52 +24,67 @@ let rev = "v8.0"; hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.2.2-unstable-2024-01-20"; + version = "7.2.2-unstable-2024-01-23"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; - rev = "fe54c2e2561c51218a5a2755842ce3fc2e0ebb35"; - hash = "sha256-LaOTJiS+COJUlyJiN9H2kEKwv5lbJqOHsUXOnb+IQFA="; + rev = "45a7a471d531d6adb5ee557ff917a99af76e92f1"; + hash = "sha256-KgCxSK72Ow29T58mlcYCJiS4D0Ov2/p37c1FSNgKZew="; }; - nativeBuildInputs = [ lazarus fpc makeWrapper ]; + nativeBuildInputs = [ + lazarus-qt + fpc + libsForQt5.wrapQtAppsHook + autoPatchelfHook + ]; - buildInputs = [ pango cairo glib atk gtk2 libX11 gdk-pixbuf ]; + buildInputs = [ + libsForQt5.qtbase + libqt5pas + ]; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + runtimeDependencies = [ + xorg.libX11 + ]; preConfigure = '' - patchShebangs configure + patchShebangs --build configure ''; buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols - lazbuild --lazarusdir=${lazarus}/share/lazarus \ - --build-mode=Release \ + lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \ + --build-mode=ReleaseQt5 \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ bgracontrols/bgracontrols.lpk \ lazpaintcontrols/lazpaintcontrols.lpk \ lazpaint/lazpaint.lpi + + runHook postBuild ''; - postBuild = '' - # Python is needed for scripts - wrapProgram $out/bin/lazpaint \ - --prefix PATH : ${lib.makeBinPath [ python3 ]} + # Python is needed for scripts + preFixup = '' + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ python3 ]}) ''; - meta = with lib; { + meta = { description = "Image editor like PaintBrush or Paint.Net"; homepage = "https://lazpaint.github.io"; downloadPage = "https://github.com/bgrabitmap/lazpaint/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "lazpaint"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix b/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix index 30d3aea41e..b980a418cb 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-UCErcNNGAVOe1CvbYc1OSwPQzXVM5tpUUtBpLXoaQdY="; + hash = "sha256-73v8xkidY9IBUFz/M0BYEVGnoVsr3uh3jP0p6T8QBbA="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/appliance.nix b/third_party/nixpkgs/pkgs/by-name/li/libguestfs-appliance/package.nix similarity index 63% rename from third_party/nixpkgs/pkgs/development/libraries/libguestfs/appliance.nix rename to third_party/nixpkgs/pkgs/by-name/li/libguestfs-appliance/package.nix index 1cedb03cb7..9282997335 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/appliance.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libguestfs-appliance/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenvNoCC -, fetchurl +{ + lib, + stdenvNoCC, + fetchurl, }: stdenvNoCC.mkDerivation rec { pname = "libguestfs-appliance"; - version = "1.46.0"; + version = "1.54.0"; src = fetchurl { url = "http://download.libguestfs.org/binaries/appliance/appliance-${version}.tar.xz"; - hash = "sha256-p1UN5wv3y+V5dFMG5yM3bVf1vaoDzQnVv9apfwC4gNg="; + hash = "sha256-D7f4Cnjx+OmLfqQWmauyXZiSjayG9TCmxftj0iOPFso="; }; installPhase = '' @@ -24,8 +25,15 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "VM appliance disk image used in libguestfs package"; homepage = "https://libguestfs.org"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = with licenses; [ + gpl2Plus + lgpl2Plus + ]; + maintainers = with maintainers; [ lukts30 ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; hydraPlatforms = [ ]; # Hydra fails with "Output limit exceeded" }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/libguestfs-with-appliance/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libguestfs-with-appliance/package.nix new file mode 100644 index 0000000000..e2f3ad0dae --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libguestfs-with-appliance/package.nix @@ -0,0 +1,12 @@ +{ + lib, + libguestfs, + libguestfs-appliance, +}: + +# https://github.com/NixOS/nixpkgs/issues/280881 +lib.warnIf (builtins.compareVersions libguestfs.version libguestfs-appliance.version > 0) + "libguestfs has a higher version than libguestfs-appliance (${libguestfs.version} > ${libguestfs-appliance.version}), runtime errors may occur!" + + libguestfs.override + { appliance = libguestfs-appliance; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/libguestfs/Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch b/third_party/nixpkgs/pkgs/by-name/li/libguestfs/Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch new file mode 100644 index 0000000000..59a0a61a17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libguestfs/Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch @@ -0,0 +1,17 @@ +Subject: [PATCH] Revert "perl: Pass @CFLAGS@ through extra_linker_flags" + +This reverts commit be06cb048b595200bf7d1cec9684ab7958188b97. +--- +--- a/perl/Build.PL.in ++++ b/perl/Build.PL.in +@@ -65,8 +65,6 @@ my $build = Module::Build->new ( + '@top_srcdir@/include', + ], + extra_linker_flags => [ +- '-DGUESTFS_PRIVATE=1', +- split (' ', '@CFLAGS@'), + '-L@top_builddir@/lib/.libs', + '-lguestfs', + ], +-- +2.44.1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/third_party/nixpkgs/pkgs/by-name/li/libguestfs/libguestfs-syms.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libguestfs/libguestfs-syms.patch rename to third_party/nixpkgs/pkgs/by-name/li/libguestfs/libguestfs-syms.patch diff --git a/third_party/nixpkgs/pkgs/by-name/li/libguestfs/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libguestfs/package.nix new file mode 100644 index 0000000000..78fc77e247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libguestfs/package.nix @@ -0,0 +1,201 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + autoreconfHook, + makeWrapper, + removeReferencesTo, + libxcrypt, + ncurses, + cpio, + gperf, + cdrkit, + flex, + bison, + qemu, + pcre2, + augeas, + libxml2, + acl, + libcap, + libcap_ng, + libconfig, + systemdLibs, + fuse, + yajl, + libvirt, + hivex, + db, + gmp, + readline, + file, + numactl, + libapparmor, + jansson, + getopt, + perlPackages, + ocamlPackages, + libtirpc, + appliance ? null, + javaSupport ? false, + jdk, + zstd, +}: + +assert appliance == null || lib.isDerivation appliance; + +stdenv.mkDerivation (finalAttrs: { + pname = "libguestfs"; + + version = "1.54.0"; + + src = fetchurl { + url = "https://libguestfs.org/download/${lib.versions.majorMinor finalAttrs.version}-stable/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-tK+g+P1YAgXqVUjUaLxuQ8O+y5leL2DmMmVSemMFQkY="; + }; + + strictDeps = true; + nativeBuildInputs = + [ + autoreconfHook + removeReferencesTo + bison + cdrkit + cpio + flex + getopt + gperf + makeWrapper + pkg-config + qemu + zstd + ] + ++ (with perlPackages; [ + perl + libintl-perl + GetoptLong + ModuleBuild + ]) + ++ (with ocamlPackages; [ + ocaml + findlib + ]); + buildInputs = [ + libxcrypt + ncurses + jansson + pcre2 + augeas + libxml2 + acl + libcap + libcap_ng + libconfig + systemdLibs + fuse + yajl + libvirt + gmp + readline + file + hivex + db + numactl + libapparmor + perlPackages.ModuleBuild + libtirpc + zstd + ocamlPackages.ocamlbuild + ocamlPackages.ocaml_libvirt + ocamlPackages.ounit + ocamlPackages.augeas + ocamlPackages.ocamlbuild + ] ++ lib.optional javaSupport jdk; + + prePatch = '' + patchShebangs . + ''; + configureFlags = [ + "--enable-daemon" + "--enable-install-daemon" + "--disable-appliance" + "--with-distro=NixOS" + "--with-readline" + "CPPFLAGS=-I${lib.getDev libxml2}/include/libxml2" + "INSTALL_OCAMLLIB=${placeholder "out"}/lib/ocaml" + "--with-guestfs-path=${placeholder "out"}/lib/guestfs" + ] ++ lib.optionals (!javaSupport) [ "--without-java" ]; + + patches = [ + ./libguestfs-syms.patch + # Fixes PERL Sys-Guestfs build failure + ./Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch + ]; + + createFindlibDestdir = true; + + installFlags = [ "REALLY_INSTALL=yes" ]; + enableParallelBuilding = true; + + outputs = [ + "out" + "guestfsd" + ]; + + postInstall = '' + # move guestfsd (the component running in the appliance) to a separate output + mkdir -p $guestfsd/bin + mv $out/sbin/guestfsd $guestfsd/bin/guestfsd + remove-references-to -t $out $guestfsd/bin/guestfsd + + mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" + for bin in $out/bin/*; do + wrapProgram "$bin" \ + --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ + --prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}" + done + ''; + + postFixup = lib.optionalString (appliance != null) '' + mkdir -p $out/{lib,lib64} + ln -s ${appliance} $out/lib64/guestfs + ln -s ${appliance} $out/lib/guestfs + ''; + + doInstallCheck = appliance != null; + installCheckPhase = '' + runHook preInstallCheck + + export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish + + ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G + + $out/bin/guestfish <<'EOF' + add-drive disk1.img + run + list-filesystems + part-disk /dev/sda mbr + mkfs ext2 /dev/sda1 + list-filesystems + EOF + + runHook postInstallCheck + ''; + + meta = { + description = "Tools for accessing and modifying virtual machine disk images"; + license = with lib.licenses; [ + gpl2Plus + lgpl21Plus + ]; + homepage = "https://libguestfs.org/"; + maintainers = with lib.maintainers; [ + offline + lukts30 + ]; + platforms = lib.platforms.linux; + # this is to avoid "output size exceeded" + hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/fix-library-resolving.patch similarity index 76% rename from third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch rename to third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/fix-library-resolving.patch index d4638791a0..9bae2b87e6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch +++ b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/fix-library-resolving.patch @@ -1,9 +1,22 @@ +From 8799541f99785d2bd881561386676fb0985e939e Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Thu, 10 Oct 2024 14:32:42 +0200 +Subject: [PATCH] fix library resolving + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + src/ldcache.c | 46 +++++++++++++++++----------------------------- + src/ldcache.h | 2 +- + src/nvc_info.c | 10 +++------- + src/nvc_ldcache.c | 2 +- + 4 files changed, 22 insertions(+), 38 deletions(-) + diff --git a/src/ldcache.c b/src/ldcache.c -index 38bab05..e1abc89 100644 +index 38bab055..8cd30a0f 100644 --- a/src/ldcache.c +++ b/src/ldcache.c -@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx) - +@@ -108,40 +108,28 @@ ldcache_close(struct ldcache *ctx) + int ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[], - char *paths[], size_t size, ldcache_select_fn select, void *select_ctx) @@ -14,26 +27,17 @@ index 38bab05..e1abc89 100644 - int override; + char dir[PATH_MAX]; + char lib[PATH_MAX]; - + - h = (struct header_libc6 *)ctx->ptr; memset(paths, 0, size * sizeof(*paths)); - + - for (uint32_t i = 0; i < h->nlibs; ++i) { - int32_t flags = h->libs[i].flags; - char *key = (char *)ctx->ptr + h->libs[i].key; - char *value = (char *)ctx->ptr + h->libs[i].value; - - if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch) -+ for (size_t j = 0; j < size; ++j) { -+ snprintf(dir, 100, "/run/opengl-driver%s/lib", -+ arch == LD_I386_LIB32 ? "-32" : ""); -+ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100)) -+ strcat(dir, "/vdpau"); -+ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version); -+ if (path_resolve_full(ctx->err, path, "/", lib) < 0) -+ return (-1); -+ if (!file_exists(ctx->err, path)) - continue; +- continue; - - for (size_t j = 0; j < size; ++j) { - if (!str_has_prefix(key, libs[j])) @@ -52,6 +56,17 @@ index 38bab05..e1abc89 100644 - } - break; - } ++ for (size_t j = 0; j < size; ++j) { ++ snprintf(dir, 100, "@driverLink@/lib"); ++ ++ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100)) ++ strcat(dir, "/vdpau"); ++ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version); ++ if (path_resolve_full(ctx->err, path, "/", lib) < 0) ++ return (-1); ++ if (!file_exists(ctx->err, path)) ++ continue; ++ + paths[j] = xstrdup(ctx->err, path); + if (paths[j] == NULL) + return (-1); @@ -59,7 +74,7 @@ index 38bab05..e1abc89 100644 return (0); } diff --git a/src/ldcache.h b/src/ldcache.h -index 33d78dd..2b087db 100644 +index 33d78dd7..2b087dbc 100644 --- a/src/ldcache.h +++ b/src/ldcache.h @@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *); @@ -68,19 +83,19 @@ index 33d78dd..2b087db 100644 int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [], - char *[], size_t, ldcache_select_fn, void *); + char *[], size_t, const char*); - + #endif /* HEADER_LDCACHE_H */ diff --git a/src/nvc_info.c b/src/nvc_info.c -index 30e3cfd..6d12a50 100644 +index b7b8adfa..d42f2beb 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -217,15 +217,13 @@ find_library_paths(struct error *err, struct dxcore_context *dxcore, struct nvc_ if (path_resolve_full(err, path, root, ldcache) < 0) return (-1); ldcache_init(&ld, err, path); - if (ldcache_open(&ld) < 0) - return (-1); - + info->nlibs = size; info->libs = array_new(err, size); if (info->libs == NULL) @@ -89,9 +104,9 @@ index 30e3cfd..6d12a50 100644 - info->libs, info->nlibs, select_libraries_fn, info) < 0) + info->libs, info->nlibs, info->nvrm_version) < 0) goto fail; - + info->nlibs32 = size; -@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -233,13 +231,11 @@ find_library_paths(struct error *err, struct dxcore_context *dxcore, struct nvc_ if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, @@ -99,32 +114,34 @@ index 30e3cfd..6d12a50 100644 + info->libs32, info->nlibs32, info->nvrm_version) < 0) goto fail; rv = 0; - + fail: - if (ldcache_close(&ld) < 0) - return (-1); return (rv); } - -@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r + +@@ -253,7 +249,7 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d char path[PATH_MAX]; int rv = -1; - + - if ((env = secure_getenv("PATH")) == NULL) { + if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) { error_setx(err, "environment variable PATH not found"); return (-1); } diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c -index 6ff380f..cbe6a69 100644 +index db3b2f69..ae5def43 100644 --- a/src/nvc_ldcache.c +++ b/src/nvc_ldcache.c -@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) +@@ -367,7 +367,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) if (validate_args(ctx, cnt != NULL) < 0) return (-1); - -- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; + +- argv = (char * []){cnt->cfg.ldconfig, "-f", "/etc/ld.so.conf", "-C", "/etc/ld.so.cache", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; + argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; if (*argv[0] == '@') { /* * We treat this path specially to be relative to the host filesystem. +-- +2.46.0 diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/inline-c-struct.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch rename to third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/inline-c-struct.patch diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/modprobe.patch b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/modprobe.patch similarity index 72% rename from third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/modprobe.patch rename to third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/modprobe.patch index c28b6bad29..1e0f8bdddc 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/modprobe.patch +++ b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/modprobe.patch @@ -1,7 +1,7 @@ diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c ---- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 -@@ -840,10 +840,10 @@ +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:36:58.096684602 +0000 ++++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:43:40.965146390 +0000 +@@ -959,10 +959,10 @@ return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); } @@ -17,13 +17,14 @@ diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils char field[32]; FILE *fp; diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h ---- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 -@@ -81,6 +81,7 @@ +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:36:58.096684602 +0000 ++++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:38:34.078700961 +0000 +@@ -87,6 +87,7 @@ int nvidia_nvswitch_get_file_state(int minor); int nvidia_cap_mknod(const char* cap_file_path, int *minor); int nvidia_cap_get_file_state(const char* cap_file_path); +int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name); + int nvidia_cap_imex_channel_mknod(int minor); + int nvidia_cap_imex_channel_file_state(int minor); int nvidia_get_chardev_major(const char *name); - - #endif /* NV_LINUX */ + int nvidia_msr_modprobe(void); diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/package.nix index 28ea0a675b..9b3023813c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libnvidia-container/package.nix @@ -1,25 +1,27 @@ -{ stdenv -, lib -, addDriverRunpath -, fetchFromGitHub -, pkg-config -, elfutils -, libcap -, libseccomp -, rpcsvc-proto -, libtirpc -, makeWrapper -, substituteAll -, removeReferencesTo -, go +{ + stdenv, + lib, + addDriverRunpath, + fetchFromGitHub, + pkg-config, + elfutils, + libcap, + libseccomp, + rpcsvc-proto, + libtirpc, + makeWrapper, + substituteAll, + removeReferencesTo, + replaceVars, + go, }: let - modprobeVersion = "495.44"; + modprobeVersion = "550.54.14"; nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = modprobeVersion; - sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU="; + sha256 = "sha256-iBRMkvOXacs/llTtvc/ZC5i/q9gc8lMuUHxMbu8A+Kg="; }; modprobePatch = substituteAll { src = ./modprobe.patch; @@ -28,21 +30,25 @@ let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.9.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "NVIDIA"; - repo = pname; + repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE="; + sha256 = "sha256-hX+2B+0kHiAC2lyo6kwe7DctPLJWgRdbhlc316OO3r8="; }; patches = [ - # locations of nvidia-driver libraries are not resolved via ldconfig which - # doesn't get used on NixOS. Additional support binaries like nvidia-smi + # Locations of nvidia driver libraries are not resolved via ldconfig which + # doesn't get used on NixOS. + # TODO: The latter doesn't really apply anymore. + # Additional support binaries like nvidia-smi # are not resolved via the environment PATH but via the derivation output # path. - ./libnvc-ldconfig-and-path-fixes.patch + (replaceVars ./fix-library-resolving.patch { + inherit (addDriverRunpath) driverLink; + }) # fix bogus struct declaration ./inline-c-struct.patch @@ -54,6 +60,11 @@ stdenv.mkDerivation rec { -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk + sed -i \ + -e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \ + -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \ + versions.mk + mkdir -p deps/src/nvidia-modprobe-${modprobeVersion} cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion} chmod -R u+w deps/src @@ -84,12 +95,26 @@ stdenv.mkDerivation rec { HOME="$(mktemp -d)" ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ]; + NIX_LDFLAGS = [ + "-L${lib.getLib libtirpc}/lib" + "-ltirpc" + ]; - nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ]; + nativeBuildInputs = [ + pkg-config + go + rpcsvc-proto + makeWrapper + removeReferencesTo + ]; - buildInputs = [ elfutils libcap libseccomp libtirpc ]; + buildInputs = [ + elfutils + libcap + libseccomp + libtirpc + ]; makeFlags = [ "WITH_LIBELF=yes" @@ -103,10 +128,14 @@ stdenv.mkDerivation rec { postInstall = let inherit (addDriverRunpath) driverLink; - libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ]; + libraryPath = lib.makeLibraryPath [ + "$out" + driverLink + "${driverLink}-32" + ]; in '' - remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.1.9.0 + remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${version} wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath} ''; disallowedReferences = [ go ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix b/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix index fdc95da3a7..5fd5b3ad54 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.10.0"; + version = "1.11.0"; nativeBuildInputs = [ installShellFiles @@ -21,7 +21,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-0I07qgl/yyNAG19eAkZAXh7TkK3V1lnQTPXskF6k/L0="; + hash = "sha256-ByDtmKLdPSFGIPCdFlNr2yv3gnyfdjiuIuKcryvKwkY="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/third_party/nixpkgs/pkgs/by-name/li/live-chart/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live-chart/package.nix new file mode 100644 index 0000000000..942fe35455 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/live-chart/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + gtk4, + libgee, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "live-chart"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "lcallarec"; + repo = "live-chart"; + rev = finalAttrs.version; + hash = "sha256-SOZJ9sVrmsZybs5BVXWmqBJ/P7SZI/X8TGWHXGvXAU8="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + gtk4 + libgee + ]; + + strictDeps = true; + + meta = { + description = "Real-time charting library for Vala and GTK4 based on Cairo"; + homepage = "https://github.com/lcallarec/live-chart"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix index c425b9743f..c558e806db 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.08.01"; + version = "2024.09.20"; src = fetchurl { urls = [ @@ -19,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-g5q3Q30B5in4CU6h7Ix6e7UEx97tnt/J4XrDT5oaGT8="; + hash = "sha256-TrUneCGaJJxC+GgL1ZZ/ZcONeqDH05Bp44/3lkCs9tg="; }; patches = [ (fetchpatch { - name = "cflags-when-darwin.patch"; + name = "0000-cflags-when-darwin.patch"; url = "https://github.com/rgaufman/live555/commit/16701af5486bb3a2d25a28edaab07789c8a9ce57.patch?full_index=1"; hash = "sha256-IDSdByBu/EBLsUTBe538rWsDwH61RJfAEhvT68Nb9rU="; }) diff --git a/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix index 06fc0d3fd0..c99e04a36b 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix @@ -4,16 +4,17 @@ , appimageTools , unzip , makeWrapper -# Notice: graphs will not sync without matching upstream's major electron version -# the specific electron version is set at top-level file to preserve override interface. -# whenever updating this package also sync electron version at top-level file. -, electron + # Notice: graphs will not sync without matching upstream's major electron version + # the specific electron version is set at top-level file to preserve override interface. + # whenever updating this package also sync electron version at top-level file. +, electron_27 , autoPatchelfHook , git , nix-update-script }: -stdenv.mkDerivation (finalAttrs: let +stdenv.mkDerivation (finalAttrs: +let inherit (finalAttrs) pname version src; inherit (stdenv.hostPlatform) system; selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); @@ -27,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: let x86_64-darwin = "sha256-0i9ozqBSeV/y8v+YEmQkbY0V6JHOv6tKub4O5Fdx2fQ="; aarch64-darwin = "sha256-Uvv96XWxpFj14wPH0DwPT+mlf3Z2dy1g/z8iBt5Te7Q="; }; -in { +in +{ pname = "logseq"; version = "0.10.9"; src = fetchurl { @@ -48,27 +50,28 @@ in { installPhase = '' runHook preInstall '' + lib.optionalString stdenv.hostPlatform.isLinux ( - let - appimageContents = appimageTools.extract { inherit pname src version; }; - in - '' - mkdir -p $out/bin $out/share/logseq $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/logseq - cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop + let + appimageContents = appimageTools.extract { inherit pname src version; }; + in + '' + mkdir -p $out/bin $out/share/logseq $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/logseq + cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git - chmod +w $out/share/logseq/resources/app/node_modules/dugite - rm -rf $out/share/logseq/resources/app/node_modules/dugite/git - chmod -w $out/share/logseq/resources/app/node_modules/dugite + # remove the `git` in `dugite` because we want the `git` in `nixpkgs` + chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git + chmod +w $out/share/logseq/resources/app/node_modules/dugite + rm -rf $out/share/logseq/resources/app/node_modules/dugite/git + chmod -w $out/share/logseq/resources/app/node_modules/dugite - mkdir -p $out/share/pixmaps - ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png + mkdir -p $out/share/pixmaps + ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png - substituteInPlace $out/share/applications/logseq.desktop \ - --replace Exec=Logseq Exec=logseq \ - --replace Icon=Logseq Icon=logseq - '') + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace $out/share/applications/logseq.desktop \ + --replace Exec=Logseq Exec=logseq \ + --replace Icon=Logseq Icon=logseq + '' + ) + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications/Logseq.app,bin} cp -R . $out/Applications/Logseq.app makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq @@ -78,7 +81,7 @@ in { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/logseq \ + makeWrapper ${electron_27}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/logseq/resources/app \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch b/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch index 610a313ca2..c2931c1762 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch +++ b/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch @@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644 - ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src + @libargs@/include + @catch2@/include -+ @yaml-cpp@/include ++ @yamlCpp@/include + @antlr4RuntimeCpp@/include/antlr4-runtime ${PROJECT_SOURCE_DIR}/src/ ) diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/package.nix index 963d00991b..06bb682645 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/luaformatter/package.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-lib-paths.patch; antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 yaml-cpp; + yamlCpp = yaml-cpp; + inherit libargs catch2; }) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lug-helper/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lug-helper/package.nix index 7f6324d816..d982f30a89 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lug-helper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lug-helper/package.nix @@ -12,12 +12,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "2.18"; + version = "3.0.1"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-x6o9hNXadlZrww5+a9xZtNfRwxKuTO/O9M9iYvhMIYc="; + hash = "sha256-GL+pPyj3Qz+wmJD59kfGz80LufotPq2KdaLQCkQnCFg="; }; buildInputs = [ @@ -45,7 +45,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { postInstall = '' install -Dm755 lug-helper.sh $out/bin/lug-helper - install -Dm644 lug-logo.png $out/share/pixmaps/lug-logo.png + install -Dm644 lug-logo.png $out/share/icons/hicolor/256x256/apps/lug-logo.png + install -Dm644 rsi-launcher.png $out/share/icons/hicolor/256x256/apps/rsi-launcher.png install -Dm644 lib/* -t $out/share/lug-helper wrapProgram $out/bin/lug-helper \ diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix index 69c54cafca..68217973b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.12"; + version = "0.5.1"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-cq1FCsBHwcL8a51MswG/5TvyzSbtOvqw06OZfIXDVwg="; + hash = "sha256-k2mDqsxM6eveIFfdRu6ZxRsIgkA2qZxLfLNeWAEFCfs="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; - cargoHash = "sha256-eXgZt8sLbHkVNWqFv8Zdq7xrFBi1YhKI8Js0OT2Npi8="; + cargoHash = "sha256-w34+3zRn4ZGA2aZZ3+lZqo4/QcDSpmt1HNb+gZtAavI="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mactop/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mactop/package.nix index 568898652e..660e642a33 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mactop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mactop/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mactop"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "context-labs"; repo = "mactop"; rev = "refs/tags/v${version}"; - hash = "sha256-BcBUOI5EE04ZTPoHGrNQjctsDFbMoe/6MZaLj/58c34="; + hash = "sha256-r9je+oeedQJsFBWWbOUcUls/EX0JZveUkmsXXtC8O0Q="; }; vendorHash = "sha256-/KecVx4Gp776t8gFSO29E1q9v29nwrKIWZYCpj7IlSo="; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mapserver/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mapserver/package.nix index 5d1739d07c..43996b4c92 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mapserver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-kZEDC89yoQP0ma5avp6r+Hz8JMpErGlBVQkhlHO6UFw="; + hash = "sha256-tub0Jd1IUkONQ5Mqz8urihbrcFLlOQybLhOvzkcwW54="; }; nativeBuildInputs = @@ -70,23 +70,24 @@ stdenv.mkDerivation rec { ] ++ lib.optional withPython python3; cmakeFlags = [ - "-DWITH_KML=ON" - "-DWITH_SOS=ON" - "-DWITH_RSVG=ON" - "-DWITH_CURL=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" + (lib.cmakeBool "WITH_KML" true) + (lib.cmakeBool "WITH_SOS" true) + (lib.cmakeBool "WITH_RSVG" true) + (lib.cmakeBool "WITH_CURL" true) + (lib.cmakeBool "WITH_CLIENT_WMS" true) + (lib.cmakeBool "WITH_CLIENT_WFS" true) + (lib.cmakeBool "WITH_PYTHON" withPython) # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optional withPython "-DWITH_PYTHON=ON"; + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + ]; - meta = with lib; { + meta = { description = "Platform for publishing spatial data and interactive mapping applications to the web"; homepage = "https://mapserver.org/"; changelog = "https://mapserver.org/development/changelog/"; - 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/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix index e781cd8a4f..f6eb02f2e7 100644 --- a/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "md-tui"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "henriklovhaug"; repo = "md-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-3lNipCYhzqeAAUQZ2ajcOakNDlwSwbUUvP8Dtu6gBsI="; + hash = "sha256-O+EIhh83nIYE2GWaThkDLIVsYsg62g/6ksS+1fKm4AY="; }; - cargoHash = "sha256-3hxU6yhMbcz3PhTDylJYnqI+eYoWJlf5Y2KecoY5zPo="; + cargoHash = "sha256-fcAXIXnXwRc6vpKiOdkXg4MsTuzI636b7cD7lgDBUT8="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix b/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix index ebe05f2fd1..130a89016a 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix @@ -24,13 +24,13 @@ assert lib.assertMsg (dictionaries != [ ]) "merge-ut-dictionaries needs at least stdenvNoCC.mkDerivation { pname = "merge-ut-dictionaries"; - version = "0-unstable-2024-09-09"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "merge-ut-dictionaries"; - rev = "35dfcca5c8657f2bf78bc000baa349c322ecb771"; - hash = "sha256-s6m430nXrG5v6iA+Fp2CKDPfFoAZirw/c3WahLrsaL4="; + rev = "4e08ad0bc0e493a35e9408edf963a3e77257b4cf"; + hash = "sha256-o+4a2FdMfKnCrZ7b+gbVwCBxs72M0QY4C8EnNyBZqXU="; }; nativeBuildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix b/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix index 5986155ee0..85b7083f15 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.151.0"; + version = "1.168.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-H6zMEicE9RT84NJmmcihw46TDOSE0HhUoIRIrpNxM+c="; + hash = "sha256-HTHqf4R3eD+LlI9qmSz4id0SPVgid8Qp4P9JZzXGKlk="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-XwIcwvTcB4vO5tqJ/jdqgkTrkmN3H0e3q5eDNOvUrcA="; + hash = "sha256-OFcXsAFMwY6BnyEVK9Px1g17CHCQWyPpr1My7u3XPpU="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mimir/package.nix similarity index 77% rename from third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix rename to third_party/nixpkgs/pkgs/by-name/mi/mimir/package.nix index 1656ec909e..82b6c120b5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/mimir/package.nix @@ -1,15 +1,13 @@ -{ lib, buildGo122Module, fetchFromGitHub, nixosTests, nix-update-script }: -# Does not build with Go 1.23 -# FIXME: check again for next release -buildGo122Module rec { +{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: +buildGoModule rec { pname = "mimir"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-XBCwc3jpLx8uj+UitFsoIAWVgC/2G8rgjOqrrLLyYdM="; + hash = "sha256-XALr755tFYaMnI913NCjwFPieedS00RXv4KhjXfOPfw="; }; vendorHash = null; @@ -53,6 +51,6 @@ buildGo122Module rec { "Grafana Mimir provides horizontally scalable, highly available, multi-tenant, long-term storage for Prometheus. "; homepage = "https://github.com/grafana/mimir"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada bryanhonof ]; + maintainers = with maintainers; [ happysalada bryanhonof adamcstephens ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix index e93f319b04..4f46c45c68 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; - hash = "sha256-Pqf6lgogk3j6Bi78x6lCVlOjhR8BhoFbhRa7l3YkqP0="; + hash = "sha256-odMJ5OCXDajm4z+oHCqtpew+U73ymghmDa/F019dAcY="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix index 205b72dfa4..d5dc55ce72 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha256-Kk8rdhKNLARG5zngWXRjcfoe9Fc6VHYre7FMkHLPMIo="; + hash = "sha256-yfavGhH/QROChWB0MxYt8+dssYo0+/1bV+h2Ce951RE="; }; extraInstallCommands = diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix index c842e475ca..3e65d48144 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix @@ -5,7 +5,7 @@ }: let pname = "miru"; - version = "5.5.0"; + version = "5.5.6"; meta = with lib; { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix index c611ccdd7e..f5ca00cd62 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-mi3lM/BQ16dCVX/kVRNhIis4sh6M0TMuK05q/pXJiS8="; + hash = "sha256-7rZwrnzoVkcXg3Z5lCMVEMyB3f5pS1t33lqogwY3I7w="; }; - vendorHash = "sha256-aABtsS39yxBBFMN98fjr4gy6QeF3dobrZqeZmmv2ywQ="; + vendorHash = "sha256-ymXpuCc1Pv12kFcBf1STT2wiUXTyT4R1DHnDCeBWbSs="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix index bc63c78924..6c23db3922 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ZEBrYqLc0+yKbroSWk01UZwA97CyOVPhqgqFArM2U8g="; + hash = "sha256-oH4raw+zIQKY+mydteKkY0LqW+13u1408ibm30j1Wss="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix index c8699987f4..2f686571d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "mixxc"; - version = "0.2.2"; + version = "0.2.3"; src = fetchCrate { pname = "mixxc"; inherit version; - hash = "sha256-Y/9l8t6Vz7yq9T1AyoHnWmIcju1rfcV0S74hiK1fEjo="; + hash = "sha256-d/bMDqDR+sBtsI3ToCcByDxqd+aE6rDPRvGBcodU6iA="; }; - cargoHash = "sha256-l9inqqUiLObrqd/8pNobwBbLaiPJD39YK/38CWfDh+Q="; + cargoHash = "sha256-RoVqQaSlIvAb8mWJNOyALjCHejFEfxjJADQfHZ5EiOs="; cargoBuildFlags = [ "--locked" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix index 62a3b556a3..ed73a1279a 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix @@ -25,33 +25,40 @@ }: let - inherit (darwin.apple_sdk_11_0.frameworks) + inherit (darwin.apple_sdk_12_3.frameworks) AVFoundation AppKit AudioUnit Cocoa VideoToolbox ; - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin then + overrideSDK stdenv { + darwinMinVersion = "11.0"; + darwinSdkVersion = "12.3"; + } + else + stdenv; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { pname = "moonlight-qt"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "moonlight-stream"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zrl8WPXvQ/7FTqFnpwoXEJ85prtgJWoWNsdckw5+JHI="; + repo = "moonlight-qt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rWVNpfRDLrWsqELPFquA6rW6/AfWV+6DNLUCPqIhle0="; fetchSubmodules = true; }; patches = [ - # Don't precompile QML files with disable-prebuilts, fix build on darwin + # Fix build for Xcode < 14 (fetchpatch { - url = "https://github.com/moonlight-stream/moonlight-qt/commit/d73df12367749425b86b72c250bb0fba13ddfd29.patch"; - hash = "sha256-RIrQpZWbwUHs1Iwz/pXfXgshJeHYrzGxuaR5mRG85QY="; + url = "https://github.com/moonlight-stream/moonlight-qt/commit/76deafbd7bf868562d69061e7d6abf2612a2c7ad.patch"; + hash = "sha256-+rXdexZQpOP6yS+oTmvYVxasWxOX16uU1udN75zNX3w="; }) ]; @@ -101,16 +108,17 @@ stdenv'.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { + changelog = "https://github.com/moonlight-stream/moonlight-qt/releases/tag/v${finalAttrs.version}"; description = "Play your PC games on almost any device"; homepage = "https://moonlight-stream.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ azuwis luc65r zmitchell ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "moonlight"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock index e6b1027f67..a5badfc41f 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "motoc" -version = "0.3.1" +version = "0.3.3" dependencies = [ "anyhow", "bindgen 0.70.1", diff --git a/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix index 23b0b6b135..d33e2c6067 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "motoc"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "galister"; repo = "motoc"; rev = "refs/tags/v${version}"; - hash = "sha256-119RWsAM5kKjsxA6wGdjhB99G31QaYlZBRaFCg5TtmI="; + hash = "sha256-AmHTnCUTHoeLsOJrD35BooU9mZr5ctoCJmjW5CaTYBY="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix index 68533127f9..4fff930fc2 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-8t/gAz08jFRuF0q3bo4y8tiIq4iYgAkXf5udYNIccu0="; + hash = "sha256-sMxggPe3m1fzfcfwsr2lUECswZ7pFSAJ8b0cURwXFmw="; fetchSubmodules = true; }; - cargoHash = "sha256-Fz7LfAn78JVip0QshoL5KMAEHMtG8bkLzz4v95/qt3E="; + cargoHash = "sha256-Gsp/AmxSobEut0jYakK0ymmSpStriAop+Abnl3GlSF4="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix index 40295db08c..1eccf58c83 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-alt-cannadic"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-alt-cannadic"; - rev = "50fee0397b87fe508f9edd45bac56f5290d8ce66"; - hash = "sha256-KKUj3d9yR2kTTTFbroZQs+OZR4KUyAUYE/X3z9/vQvM="; + rev = "7f70e48a63735c781b6453977628e594bdd50d89"; + hash = "sha256-R7qU2YNdeojuu4VTxH+M5Bvf8XAEvK6N8jPNz9MQqvU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix index 37551d7e0d..356d4822b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-edict2"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-edict2"; - rev = "b2112277d0d479b9218f42772356da3601b3e8cf"; - hash = "sha256-DIIp8FooWxyHMrQmq+2KUGEmYHKy+H6NtHrvRldxXqc="; + rev = "f68299b7113080d5e1981c97db490b3075874445"; + hash = "sha256-PdHGVudApWgQaxvAsdVui1XQR+4JHjGkhGHfcwL3wjc="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix index e7ab1d99a1..b17b500584 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-jawiki"; - version = "0-unstable-2024-09-27"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-jawiki"; - rev = "773cc08e71c4daa3c06fc577853f715a2bb4d9aa"; - hash = "sha256-TDZvB8/ZrUtkAbCr3vMfyFfhQ4v5SYWEqPNjuGB1Ve4="; + rev = "a91b76a05c4187420e46ead1cc70c2267148004b"; + hash = "sha256-EuMxFSiwSFkcpetsQpuQU6yjX4BhSmS1LbVuLacw4w0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix index 686fe1e9fe..a0c5b3761b 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-neologd"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-neologd"; - rev = "b7035b88db25ad1a933f05a33f193711c6c3b2db"; - hash = "sha256-JPTrWaDtdNs/Z0uLRwaS8Qc/l4/Y7NtwLanivyefXnk="; + rev = "d37f0514dd8c4057f2f94a92617ac7994ece3519"; + hash = "sha256-Vj/5SNe5kC07qQRAOuqRZScoOpUXjLdX0JsakNm9tfk="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix index fb3c430c45..fe3c0c1ec0 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-personal-names"; - version = "0-unstable-2024-09-21"; + version = "0-unstable-2024-10-14"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-personal-names"; - rev = "b61a5af7992d6fcdc82fa08b67b1c9771bbc4449"; - hash = "sha256-xcfhfO5GIiOVxLfqX3izLHYuSFZCgOlbQE3N3U+HTW4="; + rev = "24d783e5b1fe57af571e000861cfc70da173aedb"; + hash = "sha256-ezx4Am1xuP9SNNBsNC3KwpWghypRU97MCw10/P2LlnY="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix index 8cfb509f5b..9253bb94f0 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-place-names"; - version = "0-unstable-2024-09-03"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-place-names"; - rev = "4525819546a26fc994d7ca4a2e883fde14bf908c"; - hash = "sha256-oiSBR2QhOYyurftdEn2w6hNK1ucddlvLqGTiZk9G/4k="; + rev = "888a977a3f30451e8f286ef8eaf2f9be169234cb"; + hash = "sha256-UL3ik/CxmRM7m0AXS+UNQEipCDS8pH+AheIMx6xqAaU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix index 264490ad61..41852d7a21 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-skk-jisyo"; - version = "0-unstable-2024-07-27"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-skk-jisyo"; - rev = "7300f19e6a3f27334ed7af64589de8782549a13f"; - hash = "sha256-LJ1rP+uyh8K3IWCgKMDYt0EwEDiQqQL+wBdQCFbZM/k="; + rev = "f34f5801b1f29cff34633e4a03b887702f98ed54"; + hash = "sha256-W5ZZDSKvN5fLsFyrEKGMQl/S4q9WGLmewPqofztOPe0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix index 2ddb8fe5d2..aa3dbaf25f 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-sudachidict"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-sudachidict"; - rev = "a754f1fff5fded62cc066aa6be0ab0169059a144"; - hash = "sha256-WzhWNpqtiG9TtFHEOSbHG1mbb4ak0zCkO13g9ZWqyBE="; + rev = "a807010ef3fdc9573a83f41594e9d79b969c3f80"; + hash = "sha256-AGs/MleR/UMtVUDfxpE9clyD1uaI3SvTGFZInOo8ms0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix index 828300f4e5..9bd0b16966 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix @@ -4,6 +4,7 @@ cargo, cmake, fetchFromGitHub, + fetchpatch, go, lib, libcap, @@ -30,7 +31,23 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo="; }; - patches = [ ]; + patches = [ + # Fix build errors from deprecated QByteArray::count() + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/1b358d27d4bf29567b5d58f3591146bf639b99e1.patch"; + hash = "sha256-LeDgwZaQDgS8HNf9k2fC0RYQy4nGEq0DMNjY7muNads="; + }) + # Fix build errors from deprecated QVariant::type() + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/ebdd38ce19ef6eb80f076acf93299bd7d24ae6db.patch"; + hash = "sha256-ZWl0wHH5Foxlttj/GK5phr/C6qJv39U2GWIofZR+Rto="; + }) + # Fix build errors from deprecated QEventPoint::pos and friends + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/10b1c98517dac4eacffd6890c551b817aedd4a19.patch"; + hash = "sha256-DHOtvVDEdQ+k2ggg4HGpcv1EmKzlijNRTi1yJ7a1bWU="; + }) + ]; netfilter = buildGoModule { pname = "${finalAttrs.pname}-netfilter"; diff --git a/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix b/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix index b4e43dbe5c..152b610d7b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, flint -, gmp -, mpfr +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + flint, + gmp, + mpfr, }: stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-p7fD954aMApyBP58cvGrPwHEqhkxWlaiDHUlQT7kX4c="; + hash = "sha256-F4jEZ3+bA3FADiVZMDNE0T9kd1K1ZBInIaORqQtv+sY="; }; postPatch = '' @@ -34,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { description = "Library for polynomial system solving through algebraic methods"; mainProgram = "msolve"; homepage = "https://msolve.lip6.fr"; changelog = "https://github.com/algebraic-solving/msolve/releases/tag/${finalAttrs.src.rev}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix b/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix index 48081b49f2..00df6946c2 100644 --- a/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-OUZpPXXGWW7ceWxpHqjQolCr+OVeVO4DgRwsU8VvgWo="; + hash = "sha256-lZLWqlR6xq7DYpnydgJK8gL7WdfZcRU+8Autzh6e7kY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netbeans/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netbeans/package.nix index cfd9e0ae7d..f0a54453bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/netbeans/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/netbeans/package.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick -, jdk17, perl +{ + lib, + stdenv, + fetchurl, + makeWrapper, + makeDesktopItem, + which, + unzip, + libicns, + imagemagick, + jdk21, + perl, }: let - version = "22"; + version = "23"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +29,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha256-uuzC2iiTSn3czWod3aBbNh8mVM5bCvmjKUl0ptNdm3M="; + hash = "sha256-UNTW0K8JlkxOKz9oO3HUBPZ4yZY7uWBkFZd2uenXtZA="; }; buildCommand = '' @@ -34,9 +44,14 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${lib.makeBinPath [ jdk17 which ]} \ - --prefix JAVA_HOME : ${jdk17.home} \ - --add-flags "--jdkhome ${jdk17.home} \ + --prefix PATH : ${ + lib.makeBinPath [ + jdk21 + which + ] + } \ + --prefix JAVA_HOME : ${jdk21.home} \ + --add-flags "--jdkhome ${jdk21.home} \ -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true" # Extract pngs from the Apple icon image and create @@ -57,8 +72,15 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ perl libicns imagemagick ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; + buildInputs = [ + perl + libicns + imagemagick + ]; meta = { description = "Integrated development environment for Java, C, C++ and PHP"; @@ -68,7 +90,11 @@ stdenv.mkDerivation { binaryBytecode binaryNativeCode ]; - maintainers = with lib.maintainers; [ sander rszibele kashw2 ]; + maintainers = with lib.maintainers; [ + sander + rszibele + kashw2 + ]; platforms = lib.platforms.unix; mainProgram = "netbeans"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix new file mode 100644 index 0000000000..f8cf00516c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + stdenv, + makeWrapper, + nodejs, +}: +buildNpmPackage rec { + pname = "nextcloud-whiteboard-server"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "nextcloud"; + repo = "whiteboard"; + rev = "refs/tags/v${version}"; + hash = "sha256-27w8FZz9PbVdYV7yR5iRXi5edw7U/3bLVYfdRa8yPzo="; + }; + + npmDepsHash = "sha256-SwFQRDRo7Q8+0zYWx5szahJzDSoxkkJDPQ3qEdNLVaE="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + makeWrapper ${lib.getExe nodejs} "$out/bin/nextcloud-whiteboard-server" \ + --add-flags "$out/lib/node_modules/whiteboard/websocket_server/main.js" + ''; + + meta = { + description = "Backend server for the Nextcloud Whiteboard app"; + homepage = "https://apps.nextcloud.com/apps/whiteboard"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh index 17e7ce8a72..6870277736 100755 --- a/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh @@ -2,10 +2,19 @@ set -euo pipefail +# Detect if iptables or nftables-based firewall is used. +if [[ -e /etc/systemd/system/firewall.service ]]; then + BACKEND=iptables +elif [[ -e /etc/systemd/system/nftables.service ]]; then + BACKEND=nftables +else + echo "nixos-firewall-tool: cannot detect firewall backend" >&2 + exit 1 +fi + ip46tables() { iptables -w "$@" ip6tables -w "$@" - } show_help() { @@ -36,13 +45,34 @@ case $1 in protocol="$2" port="$3" - ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept + case $BACKEND in + iptables) + ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept + ;; + nftables) + nft add element inet nixos-fw "temp-ports" "{ $protocol . $port }" + ;; + esac ;; "show") - ip46tables --numeric --list nixos-fw + case $BACKEND in + iptables) + ip46tables --numeric --list nixos-fw + ;; + nftables) + nft list table inet nixos-fw + ;; + esac ;; "reset") - systemctl restart firewall.service + case $BACKEND in + iptables) + systemctl restart firewall.service + ;; + nftables) + nft flush set inet nixos-fw "temp-ports" + ;; + esac ;; -h|--help|help) show_help diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix index 78af5cb8d5..b5db510822 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix @@ -1,15 +1,13 @@ -{ writeShellApplication, iptables, lib }: +{ writeShellApplication, lib }: writeShellApplication { name = "nixos-firewall-tool"; + text = builtins.readFile ./nixos-firewall-tool.sh; - runtimeInputs = [ - iptables - ]; meta = with lib; { description = "Temporarily manipulate the NixOS firewall"; license = licenses.mit; - maintainers = with maintainers; [ clerie ]; + maintainers = with maintainers; [ clerie rvfg garyguo ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ns/nstool/package.nix b/third_party/nixpkgs/pkgs/by-name/ns/nstool/package.nix index 77c8dbe25e..c8186bee96 100644 --- a/third_party/nixpkgs/pkgs/by-name/ns/nstool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ns/nstool/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nstool"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jakcron"; repo = "nstool"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-FF+USFL5Y6MkAKvfR05D/+L/XJSmkiSp9WLbF7Gg2V8="; + hash = "sha256-az6AkBCO7Ew5jK/9qKQ65adwAKYf+H7QEvVI6LCXFS0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix index 8faaeec11a..eb574a0439 100644 --- a/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nvrh"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "mikew"; repo = "nvrh"; rev = "refs/tags/v${version}"; - hash = "sha256-fVoyxq2iCUANEsq+mCaQnBV9kQ59PZsGi9r7bSwStwQ="; + hash = "sha256-ff+ZdUScgAaNHASYAASQ/lfkCyX600kNw2Rjpr3TbBc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ob/obs-cmd/package.nix b/third_party/nixpkgs/pkgs/by-name/ob/obs-cmd/package.nix index 466d776194..a0a4952471 100644 --- a/third_party/nixpkgs/pkgs/by-name/ob/obs-cmd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ob/obs-cmd/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "obs-cmd"; - version = "0.17.8"; + version = "0.17.9"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; rev = "v${version}"; - hash = "sha256-IOGdy3X0/r/kuEXAvLeJk2HXtcGI+vbh4Dn1/yOpkmM="; + hash = "sha256-R3zGYVa5ux3pcniuXzKwxJK/5/7YrVOrqC2H42P2fK0="; }; - cargoHash = "sha256-oCu/ygjZxEqxE+5Vca3l1mZP3hd+r+5gi2iogQMnEcU="; + cargoHash = "sha256-bFOaR48xdc4+DvlFnXCWtzqMbE1cTo7xrsf/aIBlRX0="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix b/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix index 4a14bfa443..2e54d5e9c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation { pname = "odin"; - version = "0-unstable-2024-08-05"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; - rev = "a1c3c38f0453dcf94ba13d572fa392cb5331a878"; - hash = "sha256-LYUy/llW3BFnRx6sdTF/8QdvK/v+5/ShKJR+ZXocC+4="; + rev = "af9ae4897ad9e526d74489ddd12cfae179639ff3"; + hash = "sha256-ky3jiVk2KfOW4JjXqiCTdnbEu7bnmTVupw2r5fwyB00="; }; postPatch = diff --git a/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/omf-install b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/omf-install index 0b8be218e3..36cc440e13 100644 --- a/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/omf-install +++ b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/omf-install @@ -1,6 +1,6 @@ #!@runtimeShell@ @fish@/bin/fish \ - @OMF@/share/oh-my-fish/bin/install \ + @omf@/share/oh-my-fish/bin/install \ --noninteractive \ - --offline=@OMF@/share/oh-my-fish + --offline=@omf@/share/oh-my-fish diff --git a/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix index d18465609d..019979bf9f 100644 --- a/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cp -v ${substituteAll { name = "omf-install"; src = ./omf-install; - OMF = placeholder "out"; + omf = placeholder "out"; inherit fish runtimeShell; }} $out/bin/omf-install diff --git a/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix b/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix index ba42560650..d6f7e9664d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-08-05"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "5f53ba1670b4bd44f6faf589823aa404f3c1a62b"; - hash = "sha256-4Rw3eNXkmdRMLz9k1UaK6xr0KS4g4AnFpOcrWLos2jg="; + rev = "834ec9ad3f50add0ee8e44071275c318a9f35abb"; + hash = "sha256-K32coqh6eCId+Rdfbu9TnN2RHDlvxF+BDsxAoP3Xk30="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix index 50877ded84..f78e6a9de9 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix @@ -5,7 +5,6 @@ jsoncpp, lib, libGL, - openxr-loader, python3, stdenv, unstableGitUpdater, @@ -22,7 +21,8 @@ stdenv.mkDerivation { owner = "znixian"; repo = "OpenOVR"; rev = "f969a972e9a151de776fa8d1bd6e67056f0a5d5d"; - hash = "sha256-CE+ushwNv8kQSXtrQ6K5veBmpQvQaMKk6P9G1wV2uvM="; + fetchSubmodules = true; + hash = "sha256-3Aar7HGhn9nd/EtJoeUbQTkUR16jx946ZXMNDOXSdfQ="; }; nativeBuildInputs = [ cmake ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation { glm jsoncpp libGL - openxr-loader python3 vulkan-headers vulkan-loader @@ -40,7 +39,8 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") - (lib.cmakeBool "USE_SYSTEM_OPENXR" true) + # See https://gitlab.com/znixian/OpenOVR/-/issues/416 + (lib.cmakeBool "USE_SYSTEM_OPENXR" false) (lib.cmakeBool "USE_SYSTEM_GLM" true) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/opengist/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opengist/package.nix index 03b23225ad..ef8c6f5b82 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opengist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opengist/package.nix @@ -1,20 +1,37 @@ -{ lib, buildGoModule, buildNpmPackage, fetchFromGitHub, moreutils, jq, git }: +{ + lib, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + moreutils, + npm-lockfile-fix, + jq, + git, +}: let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.6.1"; + version = "1.7.5"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; rev = "v${version}"; - hash = "sha256-rJ8oiH08kSSFNgPHKGo68Oi1i3L1SEJyHuzoxKMOZME="; + hash = "sha256-mZ4j9UWdKa3nygcRO5ceyONetkks3ZGWxvzD34eOXew="; + + # follow https://github.com/thomiceli/opengist/pull/350 and remove here + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; }; frontend = buildNpmPackage { pname = "opengist-frontend"; inherit version src; - nativeBuildInputs = [ moreutils jq ]; + nativeBuildInputs = [ + moreutils + jq + ]; # npm complains of "invalid package". shrug. we can give it a version. preBuild = '' @@ -33,15 +50,17 @@ let cp -R public $out ''; - npmDepsHash = "sha256-Sy321tIQOOrypk+EOGGixEzrPdhA9U8Hak+DOS+d00A="; + npmDepsHash = "sha256-cITkgRvWOml6uH77WkiNgFedEuPNze63Gntet09uS5w="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-IorqXJKzUTUL5zfKRipZaJtRlwVOmTwolJXFG/34Ais="; - tags = [ - "fs_embed" + vendorHash = "sha256-6PpS/dsonc/akBn8NwUIVFNe2FjynAhF1TYIYT9K/ws="; + tags = [ "fs_embed" ]; + ldflags = [ + "-s" + "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${version}" ]; # required for tests @@ -62,10 +81,11 @@ buildGoModule { meta = { description = "Self-hosted pastebin powered by Git"; - mainProgram = "opengist"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - maintainers = [ ]; + changelog = "https://github.com/thomiceli/opengist/blob/master/CHANGELOG.md"; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ phanirithvij ]; + mainProgram = "opengist"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix index 03d8282044..5ed445a55e 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -4,6 +4,7 @@ , fetchFromGitea , pkg-config , pcsclite +, dbus , testers , openpgp-card-tools , darwin @@ -11,21 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.3"; + version = "0.11.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-htFhNzBuinj9qiTzcW0eia74jvCT/+9b1aLli594JJQ="; + hash = "sha256-ZnIJLNg9soRzGEjoRNbUzDUtj71y54t+qTC4QDjiCmM="; }; - cargoHash = "sha256-I2ExtUUM0ZJyhtyzP+IsgiMPMUFVHqPiMHFlvuUMjRc="; + cargoHash = "sha256-t+fKCviu9UOz2GHkIBqtSp0vyqXPAR1TuWi4yOYR0Bc="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.PCSC darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvmm/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/op/openvmm/Cargo.lock new file mode 100644 index 0000000000..f2d618b44f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openvmm/Cargo.lock @@ -0,0 +1,8750 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aarch64defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "zerocopy", +] + +[[package]] +name = "aarch64emu" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "futures", + "getrandom", + "inspect", + "pal_async", + "parking_lot", + "thiserror", + "tracing", +] + +[[package]] +name = "acpi" +version = "0.0.0" +dependencies = [ + "acpi_spec", + "memory_range", + "x86defs", + "zerocopy", +] + +[[package]] +name = "acpi_spec" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "static_assertions", + "thiserror", + "zerocopy", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arc_cyclic_builder" +version = "0.0.0" +dependencies = [ + "futures-executor", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "awaitgroup" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a872ceb3db05a391fbe7cf8eba07a1239b2d946eee66f9e942be9bff06206302" + +[[package]] +name = "azure_profiler_proto" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "mesh_build", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64-serde" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitfield-struct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2ce686adbebce0ee484a502c440b4657739adbad65eadf06d64f5816ee9765" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitvec" +version = "1.1.0" +source = "git+https://github.com/smalis-msft/bitvec?branch=set-aliased-previous-val#d0aea0cf9e71323f41f1732634edb3aff2bf70f2" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "bootloader_fdt_parser" +version = "0.0.0" +dependencies = [ + "anyhow", + "fdt", + "fs-err", + "igvm_defs", + "inspect", + "loader_defs", + "memory_range", + "vm_topology", +] + +[[package]] +name = "bstr" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "build_info" +version = "0.0.0" +dependencies = [ + "inspect", + "vergen", +] + +[[package]] +name = "build_rs_guest_arch" +version = "0.0.0" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder_slice" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b294e30387378958e8bf8f4242131b930ea615ff81e8cac2440cea0a6013190" +dependencies = [ + "byteorder", +] + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cache_topology" +version = "0.0.0" +dependencies = [ + "fs-err", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] +name = "caps" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" +dependencies = [ + "libc", + "thiserror", +] + +[[package]] +name = "cargo_toml" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[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 = "chipset" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "chipset_resources", + "futures", + "input_core", + "inspect", + "inspect_counters", + "local_clock", + "mesh", + "open_enum", + "pal_async", + "power_resources", + "test_with_tracing", + "thiserror", + "time", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", + "x86defs", +] + +[[package]] +name = "chipset_arc_mutex_device" +version = "0.0.0" +dependencies = [ + "arc_cyclic_builder", + "chipset_device", + "closeable_mutex", + "parking_lot", + "range_map_vec", + "thiserror", + "tracing", +] + +[[package]] +name = "chipset_device" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", +] + +[[package]] +name = "chipset_device_fuzz" +version = "0.0.0" +dependencies = [ + "arbitrary", + "chipset_arc_mutex_device", + "chipset_device", + "closeable_mutex", + "futures", + "parking_lot", + "range_map_vec", + "tracing", + "zerocopy", +] + +[[package]] +name = "chipset_device_resources" +version = "0.0.0" +dependencies = [ + "async-trait", + "chipset_device", + "guestmem", + "inspect", + "vm_resource", + "vmcore", +] + +[[package]] +name = "chipset_legacy" +version = "0.0.0" +dependencies = [ + "chipset", + "chipset_device", + "floppy", + "floppy_pcat_stub", + "guestmem", + "inspect", + "local_clock", + "memory_range", + "mesh", + "open_enum", + "pal_async", + "pci_bus", + "pci_core", + "thiserror", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "chipset_resources" +version = "0.0.0" +dependencies = [ + "arbitrary", + "inspect", + "mesh", + "vm_resource", +] + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ci_logger" +version = "0.0.0" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_dyn_complete" +version = "0.0.0" +dependencies = [ + "async-trait", + "clap", + "futures", + "log", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "clipboard-win" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" +dependencies = [ + "error-code", +] + +[[package]] +name = "closeable_mutex" +version = "0.0.0" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "consomme" +version = "0.0.0" +dependencies = [ + "futures", + "getrandom", + "inspect", + "libc", + "mesh", + "pal_async", + "resolv-conf", + "smoltcp", + "socket2", + "thiserror", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[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 = "ctrlc" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +dependencies = [ + "nix 0.27.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "cvm_tracing" +version = "0.0.0" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "debug_ptr" +version = "0.0.0" + +[[package]] +name = "debug_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "debug_worker_defs", + "futures", + "gdbstub", + "inspect", + "mesh", + "mesh_worker", + "pal_async", + "socket2", + "tracelimit", + "tracing", + "vmm_core_defs", + "vmsocket", +] + +[[package]] +name = "debug_worker_defs" +version = "0.0.0" +dependencies = [ + "mesh", + "mesh_worker", + "vmm_core_defs", + "vmsocket", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "der_derive", + "zeroize", +] + +[[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive-into-owned" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d94d81e3819a7b06a8638f448bc6339371ca9b6076a99d4a43eece3c4c923" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "device_emulators" +version = "0.0.0" + +[[package]] +name = "diag_client" +version = "0.0.0" +dependencies = [ + "anyhow", + "diag_proto", + "fs-err", + "futures", + "guid", + "inspect", + "inspect_proto", + "mesh", + "mesh_rpc", + "pal_async", + "socket2", + "thiserror", + "unix_socket", + "vmsocket", + "windows-sys 0.52.0", +] + +[[package]] +name = "diag_proto" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "mesh_build", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "diag_server" +version = "0.0.0" +dependencies = [ + "anyhow", + "azure_profiler_proto", + "build_rs_guest_arch", + "diag_proto", + "fs-err", + "futures", + "futures-concurrency", + "hvdef", + "inspect", + "inspect_proto", + "libc", + "mesh", + "mesh_rpc", + "net_packet_capture", + "pal", + "pal_async", + "parking_lot", + "profiler_worker", + "safe_x86_intrinsics", + "socket2", + "tracing", + "underhill_confidentiality", + "unix_socket", + "vmsocket", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "disk_backend" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "guestmem", + "inspect", + "scsi_buffers", + "stackfuture", + "thiserror", + "vm_resource", +] + +[[package]] +name = "disk_backend_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "disk_blob" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "blocking", + "disk_backend", + "disk_backend_resources", + "guestmem", + "http", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "inspect", + "once_cell", + "scsi_buffers", + "stackfuture", + "thiserror", + "tokio", + "vhd1_defs", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_blockdevice" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "blocking", + "disk_backend", + "event-listener", + "fs-err", + "futures", + "guestmem", + "hvdef", + "inspect", + "io-uring", + "libc", + "mesh", + "nix 0.26.4", + "nvme_common", + "nvme_spec", + "once_cell", + "open_enum", + "pal", + "pal_async", + "pal_uring", + "scsi_buffers", + "stackfuture", + "tempfile", + "thiserror", + "tracing", + "uevent", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_file" +version = "0.0.0" +dependencies = [ + "blocking", + "disk_backend", + "disk_backend_resources", + "guestmem", + "inspect", + "scsi_buffers", + "stackfuture", + "vm_resource", +] + +[[package]] +name = "disk_nvme" +version = "0.0.0" +dependencies = [ + "async-trait", + "disk_backend", + "inspect", + "nvme_common", + "nvme_driver", + "nvme_spec", + "pal", + "scsi_buffers", + "stackfuture", +] + +[[package]] +name = "disk_prwrap" +version = "0.0.0" +dependencies = [ + "async-trait", + "disk_backend", + "disk_backend_resources", + "inspect", + "parking_lot", + "scsi_buffers", + "stackfuture", + "tracing", + "vm_resource", +] + +[[package]] +name = "disk_ramdisk" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "disk_backend", + "disk_backend_resources", + "event-listener", + "guestmem", + "inspect", + "pal_async", + "parking_lot", + "scsi_buffers", + "stackfuture", + "thiserror", + "tracing", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_striped" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "disk_backend", + "disk_backend_resources", + "disk_ramdisk", + "futures", + "guestmem", + "hvdef", + "inspect", + "pal_async", + "scsi_buffers", + "stackfuture", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", +] + +[[package]] +name = "disk_vhd1" +version = "0.0.0" +dependencies = [ + "disk_backend", + "disk_backend_resources", + "disk_file", + "guestmem", + "guid", + "inspect", + "pal_async", + "scsi_buffers", + "stackfuture", + "tempfile", + "thiserror", + "vhd1_defs", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_vhdmp" +version = "0.0.0" +dependencies = [ + "disk_backend", + "disk_file", + "disk_vhd1", + "futures", + "guid", + "inspect", + "mesh", + "scsi_buffers", + "stackfuture", + "tempfile", + "thiserror", + "vm_resource", + "winapi", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "elfcore" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051a3f44a8f1d574d13116351c3f2bc466801495d52578d1d34ac4ddbcd6ecb4" +dependencies = [ + "libc", + "nix 0.26.4", + "smallvec", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml", + "vswhom", + "winreg", +] + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fast_select" +version = "0.0.0" +dependencies = [ + "futures", + "pal_async", + "parking_lot", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fatfs" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05669f8e7e2d7badc545c513710f0eba09c2fbef683eb859fd79c46c355048e0" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "log", +] + +[[package]] +name = "fd-lock" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" +dependencies = [ + "cfg-if", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fdt" +version = "0.0.0" +dependencies = [ + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "filepath" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7faa16fcec147281a1719947edb44af4f9124964bf7476bd5f5356a48e44dcc" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "firmware_pcat" +version = "0.0.0" +dependencies = [ + "chipset_device", + "generation_id", + "getrandom", + "guestmem", + "guid", + "inspect", + "memory_range", + "mesh", + "open_enum", + "static_assertions", + "thiserror", + "tracelimit", + "tracing", + "vm_topology", + "vmcore", + "zerocopy", +] + +[[package]] +name = "firmware_uefi" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "der", + "firmware_uefi_custom_vars", + "generation_id", + "getrandom", + "guestmem", + "guid", + "inspect", + "local_clock", + "mesh", + "open_enum", + "openssl", + "pal_async", + "test_with_tracing", + "thiserror", + "time", + "tracelimit", + "tracing", + "ucs2 0.0.0", + "uefi_nvram_specvars", + "uefi_nvram_storage", + "uefi_specs", + "vmcore", + "watchdog_core", + "wchar", + "zerocopy", +] + +[[package]] +name = "firmware_uefi_custom_vars" +version = "0.0.0" +dependencies = [ + "guid", + "mesh_protobuf", + "thiserror", + "uefi_specs", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "floppy" +version = "0.0.0" +dependencies = [ + "arrayvec", + "bitfield-struct", + "chipset_device", + "disk_backend", + "guestmem", + "inspect", + "mesh", + "open_enum", + "scsi_buffers", + "thiserror", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "floppy_pcat_stub" +version = "0.0.0" +dependencies = [ + "arrayvec", + "bitfield-struct", + "chipset_device", + "inspect", + "mesh", + "open_enum", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "floppy_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "flowey" +version = "0.0.0" +dependencies = [ + "anyhow", + "flowey_core", + "fs-err", + "log", + "serde", +] + +[[package]] +name = "flowey_cli" +version = "0.0.0" +dependencies = [ + "anyhow", + "ci_logger", + "clap", + "flowey_core", + "fs-err", + "log", + "parking_lot", + "petgraph", + "schema_ado_yaml", + "serde", + "serde_json", + "serde_yaml", + "toml_edit", + "xshell", +] + +[[package]] +name = "flowey_core" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "linkme", + "serde", + "serde_json", + "serde_yaml", +] + +[[package]] +name = "flowey_hvlite" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "flowey", + "flowey_cli", + "flowey_lib_common", + "flowey_lib_hvlite", + "log", + "serde", + "target-lexicon", +] + +[[package]] +name = "flowey_lib_common" +version = "0.0.0" +dependencies = [ + "anyhow", + "dirs", + "flowey", + "fs-err", + "home", + "log", + "rlimit", + "rustc-hash", + "serde", + "target-lexicon", + "toml_edit", + "which 6.0.0", + "xshell", +] + +[[package]] +name = "flowey_lib_hvlite" +version = "0.0.0" +dependencies = [ + "anyhow", + "flowey", + "flowey_lib_common", + "fs-err", + "igvmfilegen_config", + "log", + "serde", + "serde_json", + "target-lexicon", + "vmm_test_images", + "which 6.0.0", + "xshell", +] + +[[package]] +name = "flowey_trampoline" +version = "0.0.0" + +[[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 = "framebuffer" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chipset_device", + "guestmem", + "inspect", + "memory_range", + "mesh", + "parking_lot", + "sparse_mmap", + "tracing", + "video_core", + "vm_resource", + "vmcore", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "fscommon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "315ce685aca5ddcc5a3e7e436ef47d4a5d0064462849b6f0f628c28140103531" +dependencies = [ + "log", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "fuse" +version = "0.0.0" +dependencies = [ + "libc", + "lx", + "parking_lot", + "tempfile", + "test_with_tracing", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-concurrency" +version = "7.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6712e11cdeed5c8cf21ea0b90fec40fbe64afc9bbf2339356197eeca829fc3" +dependencies = [ + "bitvec", + "futures-core", + "pin-project", + "slab", + "smallvec", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzz_chipset" +version = "0.0.0" +dependencies = [ + "arbitrary", + "chipset", + "chipset_device_fuzz", + "chipset_resources", + "libfuzzer-sys", + "local_clock", + "mesh", + "pal_async", + "vmcore", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_firmware_uefi" +version = "0.0.0" +dependencies = [ + "arbitrary", + "firmware_uefi", + "guid", + "libfuzzer-sys", + "openssl", + "ucs2 0.0.0", + "uefi_nvram_specvars", + "xtask_fuzz", + "zerocopy", +] + +[[package]] +name = "fuzz_guestmem" +version = "0.0.0" +dependencies = [ + "arbitrary", + "guestmem", + "libfuzzer-sys", + "smallvec", + "sparse_mmap", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_ide" +version = "0.0.0" +dependencies = [ + "arbitrary", + "chipset_arc_mutex_device", + "chipset_device", + "chipset_device_fuzz", + "disk_ramdisk", + "guestmem", + "ide", + "libfuzzer-sys", + "pci_core", + "scsidisk", + "vmcore", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_inspect" +version = "0.0.0" +dependencies = [ + "arbitrary", + "futures", + "inspect", + "libfuzzer-sys", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_mesh_ttrpc" +version = "0.0.0" +dependencies = [ + "futures", + "libfuzzer-sys", + "mesh", + "mesh_build", + "mesh_rpc", + "pal_async", + "prost", + "prost-build", + "tempfile", + "unix_socket", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_scsi_buffers" +version = "0.0.0" +dependencies = [ + "arbitrary", + "guestmem", + "libfuzzer-sys", + "scsi_buffers", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_sparse_mmap" +version = "0.0.0" +dependencies = [ + "arbitrary", + "libfuzzer-sys", + "sparse_mmap", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_ucs2" +version = "0.0.0" +dependencies = [ + "arbitrary", + "libfuzzer-sys", + "ucs2 0.0.0", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_x86emu" +version = "0.0.0" +dependencies = [ + "arbitrary", + "futures", + "libfuzzer-sys", + "x86defs", + "x86emu", + "xtask_fuzz", +] + +[[package]] +name = "gdbstub" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "log", + "managed", + "num-traits", + "paste", +] + +[[package]] +name = "gdma" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chipset_device", + "device_emulators", + "futures", + "gdma_defs", + "gdma_resources", + "guestmem", + "inspect", + "net_backend", + "net_backend_resources", + "parking_lot", + "pci_core", + "pci_resources", + "slab", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "gdma_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guestmem", + "inspect", + "open_enum", + "zerocopy", +] + +[[package]] +name = "gdma_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "net_backend_resources", + "vm_resource", +] + +[[package]] +name = "generation_id" +version = "0.0.0" +dependencies = [ + "getrandom", + "guestmem", + "inspect", + "mesh", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "get_helpers" +version = "0.0.0" +dependencies = [ + "get_protocol", + "guid", + "zerocopy", +] + +[[package]] +name = "get_protocol" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guid", + "open_enum", + "serde", + "serde_helpers", + "serde_json", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "get_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "thiserror", + "vm_resource", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "gptman" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6ee4a804a77da3ec5d3738c44fbe34c0ecc7f0fdc0ab3a96d989f78a57fe74" +dependencies = [ + "bincode", + "crc", + "nix 0.26.4", + "serde", + "thiserror", +] + +[[package]] +name = "grep-matcher" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" +dependencies = [ + "memchr", +] + +[[package]] +name = "grep-regex" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" +dependencies = [ + "bstr", + "grep-matcher", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "grep-searcher" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" +dependencies = [ + "bstr", + "encoding_rs", + "encoding_rs_io", + "grep-matcher", + "log", + "memchr", + "memmap2", +] + +[[package]] +name = "guest_crash_device" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "get_protocol", + "get_resources", + "guid", + "inspect", + "mesh", + "task_control", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmcore", + "zerocopy", +] + +[[package]] +name = "guest_emulation_device" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "get_protocol", + "get_resources", + "guid", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "power_resources", + "serde_json", + "task_control", + "thiserror", + "time", + "tracing", + "video_core", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "guest_emulation_log" +version = "0.0.0" +dependencies = [ + "async-trait", + "get_protocol", + "get_resources", + "inspect", + "serde", + "serde_json", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "guest_emulation_transport" +version = "0.0.0" +dependencies = [ + "chipset_resources", + "futures", + "futures-concurrency", + "get_protocol", + "getrandom", + "guest_emulation_device", + "guestmem", + "guid", + "hvdef", + "inspect", + "inspect_counters", + "mesh", + "pal_async", + "parking_lot", + "power_resources", + "serde_json", + "shared_pool_alloc", + "test_with_tracing", + "thiserror", + "tracing", + "tracing_helpers", + "underhill_config", + "unicycle", + "vm_resource", + "vmbus_async", + "vmbus_ring", + "vmbus_user_channel", + "vpci", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "guest_test_uefi" +version = "0.0.0" +dependencies = [ + "uefi", +] + +[[package]] +name = "guest_watchdog" +version = "0.0.0" +dependencies = [ + "chipset_device", + "inspect", + "mesh", + "open_enum", + "tracelimit", + "vmcore", + "watchdog_core", +] + +[[package]] +name = "guestmem" +version = "0.0.0" +dependencies = [ + "inspect", + "pal_event", + "sparse_mmap", + "thiserror", + "zerocopy", +] + +[[package]] +name = "guid" +version = "0.0.0" +dependencies = [ + "getrandom", + "inspect", + "mesh_protobuf", + "thiserror", + "winapi", + "windows-sys 0.52.0", + "zerocopy", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "hcl" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "build_rs_guest_arch", + "getrandom", + "hvdef", + "libc", + "memory_range", + "nix 0.26.4", + "open_enum", + "pal", + "parking_lot", + "safe_x86_intrinsics", + "sidecar_client", + "signal-hook", + "tdcall", + "thiserror", + "tracelimit", + "tracing", + "vtl_array", + "x86defs", + "zerocopy", +] + +[[package]] +name = "hcl_compat_uefi_nvram_storage" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guid", + "inspect", + "open_enum", + "pal_async", + "static_assertions", + "thiserror", + "tracing", + "ucs2 0.0.0", + "uefi_nvram_storage", + "wchar", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "host_fdt_parser" +version = "0.0.0" +dependencies = [ + "arrayvec", + "fdt", + "hvdef", + "igvm_defs", + "inspect", + "memory_range", + "tracing", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hv1_emulator" +version = "0.0.0" +dependencies = [ + "build_rs_guest_arch", + "guestmem", + "hvdef", + "inspect", + "parking_lot", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "vmcore", + "vtl_array", + "x86defs", + "zerocopy", +] + +[[package]] +name = "hv1_hypercall" +version = "0.0.0" +dependencies = [ + "guestmem", + "hvdef", + "open_enum", + "sparse_mmap", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "zerocopy", +] + +[[package]] +name = "hvdef" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "hvlite_core" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "acpi", + "anyhow", + "async-trait", + "build_rs_guest_arch", + "cache_topology", + "cfg-if", + "chipset_device_resources", + "chipset_legacy", + "debug_ptr", + "disk_backend", + "fdt", + "firmware_pcat", + "firmware_uefi", + "firmware_uefi_custom_vars", + "floppy", + "floppy_resources", + "framebuffer", + "futures", + "futures-concurrency", + "get_resources", + "getrandom", + "guestmem", + "guid", + "hcl_compat_uefi_nvram_storage", + "hvdef", + "hvlite_defs", + "hvlite_pcat_locator", + "ide", + "ide_resources", + "igvm", + "igvm_defs", + "input_core", + "inspect", + "loader", + "local_clock", + "membacking", + "memory_range", + "mesh", + "mesh_worker", + "missing_dev", + "page_table", + "pal", + "pal_async", + "pci_bus", + "pci_core", + "range_map_vec", + "scsi_core", + "scsidisk", + "serial_16550_resources", + "sparse_mmap", + "state_unit", + "storvsp", + "thiserror", + "tracing", + "tracing_helpers", + "uefi_nvram_storage", + "virt", + "virt_hvf", + "virt_kvm", + "virt_mshv", + "virt_whp", + "virtio", + "virtio_serial", + "vm_loader", + "vm_resource", + "vm_topology", + "vmbus_channel", + "vmbus_server", + "vmcore", + "vmgs", + "vmgs_broker", + "vmm_core", + "vmm_core_defs", + "vmotherboard", + "vmswitch", + "vpci", + "watchdog_core", + "watchdog_vmgs_format", + "zerocopy", +] + +[[package]] +name = "hvlite_defs" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "firmware_uefi_custom_vars", + "floppy_resources", + "framebuffer", + "get_resources", + "guid", + "hvlite_pcat_locator", + "ide_resources", + "input_core", + "memory_range", + "mesh", + "mesh_worker", + "net_backend_resources", + "thiserror", + "unix_socket", + "virt", + "virt_whp", + "vm_resource", + "vmbus_proxy", + "vmm_core_defs", + "vmotherboard", +] + +[[package]] +name = "hvlite_entry" +version = "0.0.0" +dependencies = [ + "anyhow", + "awaitgroup", + "build_rs_guest_arch", + "chipset_resources", + "clap", + "clap_dyn_complete", + "debug_worker_defs", + "diag_client", + "dirs", + "disk_backend_resources", + "firmware_uefi_custom_vars", + "floppy_resources", + "framebuffer", + "fs-err", + "futures", + "futures-concurrency", + "gdma_resources", + "get_resources", + "getrandom", + "guid", + "hvlite_defs", + "hvlite_helpers", + "hvlite_pcat_locator", + "hvlite_ttrpc_vmservice", + "hyperv_ic_resources", + "hyperv_secure_boot_templates", + "hyperv_uefi_custom_vars_json", + "ide_resources", + "input_core", + "inspect", + "inspect_proto", + "macaddr", + "mcr_resources", + "mesh", + "mesh_process", + "mesh_rpc", + "mesh_worker", + "net_backend_resources", + "netvsp_resources", + "nvme_resources", + "openssl", + "pal", + "pal_async", + "parking_lot", + "prost", + "rustyline", + "scsidisk_resources", + "serial_16550_resources", + "serial_socket", + "shell-words", + "sparse_mmap", + "storvsp_resources", + "term", + "thiserror", + "tpm_resources", + "tracelimit", + "tracing", + "tracing-subscriber", + "tracing_helpers", + "uidevices_resources", + "unix_socket", + "video_core", + "virt_whp", + "virtio_resources", + "vm_manifest_builder", + "vm_resource", + "vmbfs_resources", + "vmbus_core", + "vmbus_proxy", + "vmbus_serial_resources", + "vmcore", + "vmgs_format", + "vmgs_resources", + "vmm_core_defs", + "vmotherboard", + "vmswitch", + "vnc_worker_defs", + "vtl2_settings_proto", + "whp", + "win_etw_tracing", + "winapi", +] + +[[package]] +name = "hvlite_helpers" +version = "0.0.0" +dependencies = [ + "anyhow", + "disk_backend_resources", + "disk_vhd1", + "disk_vhdmp", + "futures", + "futures-concurrency", + "get_resources", + "hvlite_defs", + "mesh", + "pal_async", + "tempfile", + "tracing", + "unicycle", + "vm_resource", +] + +[[package]] +name = "hvlite_pcat_locator" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "mesh", + "object", + "tracing", +] + +[[package]] +name = "hvlite_ttrpc_vmservice" +version = "0.0.0" +dependencies = [ + "mesh", + "mesh_build", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperv_ic" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "futures-concurrency", + "hyperv_ic_protocol", + "hyperv_ic_resources", + "inspect", + "mesh", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "hyperv_ic_guest" +version = "0.0.0" +dependencies = [ + "guid", + "hyperv_ic_protocol", + "hyperv_ic_resources", + "inspect", + "mesh", + "task_control", + "thiserror", + "tracelimit", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_relay_intercept_device", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "hyperv_ic_protocol" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guid", + "open_enum", + "zerocopy", +] + +[[package]] +name = "hyperv_ic_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "hyperv_secure_boot_templates" +version = "0.0.0" +dependencies = [ + "firmware_uefi_custom_vars", + "hyperv_uefi_custom_vars_json", + "serde_json", +] + +[[package]] +name = "hyperv_uefi_custom_vars_json" +version = "0.0.0" +dependencies = [ + "base64 0.21.7", + "firmware_uefi_custom_vars", + "guid", + "serde", + "serde_helpers", + "serde_json", + "thiserror", + "zerocopy", +] + +[[package]] +name = "iced-x86" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd366a53278429c028367e0ba22a46cab6d565a57afb959f06e92c7a69e7828" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "ide" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "bitflags 1.3.2", + "chipset_device", + "disk_backend", + "disk_file", + "guestmem", + "ide_resources", + "inspect", + "mesh", + "open_enum", + "pal_async", + "pci_core", + "safeatomic", + "scsi_buffers", + "scsi_core", + "scsi_defs", + "scsidisk", + "static_assertions", + "tempfile", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "vmcore", + "zerocopy", +] + +[[package]] +name = "ide_resources" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "scsidisk_resources", + "vm_resource", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.3", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "igvm" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7984b10433b50e06a06bd50c69bca4888a5d7de8975f64ea4c2a7687eb99b09d" +dependencies = [ + "bitfield-struct", + "crc32fast", + "hex", + "igvm_defs", + "open-enum", + "range_map_vec", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "igvm_defs" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64ec5588c475372ae830475d3ee9a7bd255407dcb9f03faf6d493556eb6105a" +dependencies = [ + "bitfield-struct", + "open-enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "igvmfilegen" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "fs-err", + "hex", + "hvdef", + "igvm", + "igvm_defs", + "igvmfilegen_config", + "loader", + "loader_defs", + "memory_range", + "range_map_vec", + "serde", + "serde_json", + "sha2", + "thiserror", + "tracing", + "tracing-subscriber", + "underhill_confidentiality", + "vbs_defs", + "x86defs", + "zerocopy", +] + +[[package]] +name = "igvmfilegen_config" +version = "0.0.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "image" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "input_core" +version = "0.0.0" +dependencies = [ + "futures", + "mesh", + "vm_resource", +] + +[[package]] +name = "inspect" +version = "0.0.0" +dependencies = [ + "arbitrary", + "base64 0.21.7", + "bitfield-struct", + "filepath", + "futures", + "inspect_derive", + "mesh", + "pal_async", + "parking_lot", + "thiserror", +] + +[[package]] +name = "inspect_counters" +version = "0.0.0" +dependencies = [ + "inspect", +] + +[[package]] +name = "inspect_derive" +version = "0.0.0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "inspect_proto" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "mesh_build", + "mesh_protobuf", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "inspect_rlimit" +version = "0.0.0" +dependencies = [ + "cfg-if", + "inspect", + "libc", + "thiserror", +] + +[[package]] +name = "inspect_task" +version = "0.0.0" +dependencies = [ + "inspect", + "pal_async", +] + +[[package]] +name = "io-uring" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.52.0", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "kmsg" +version = "0.0.0" +dependencies = [ + "thiserror", +] + +[[package]] +name = "kmsg_defs" +version = "0.0.0" + +[[package]] +name = "kvm" +version = "0.0.0" +dependencies = [ + "kvm-bindings", + "libc", + "nix 0.26.4", + "pal", + "parking_lot", + "signal-hook", + "thiserror", +] + +[[package]] +name = "kvm-bindings" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081fbd8164229a990fbf24a1f35d287740db110c2b5d42addf460165f1b0e032" + +[[package]] +name = "landlock" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + +[[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.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "linkme" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b53ad6a33de58864705954edb5ad5d571a010f9e296865ed43dc72a5621b430" +dependencies = [ + "linkme-impl", +] + +[[package]] +name = "linkme-impl" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux_net_bindings" +version = "0.0.0" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "loader" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "bitfield-struct", + "build_rs_guest_arch", + "crc32fast", + "guid", + "hvdef", + "igvm", + "loader_defs", + "memory_range", + "object", + "open_enum", + "page_table", + "thiserror", + "tracing", + "vm_topology", + "x86defs", + "zerocopy", +] + +[[package]] +name = "loader_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "hvdef", + "inspect", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "local_clock" +version = "0.0.0" +dependencies = [ + "inspect", + "parking_lot", + "time", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lx" +version = "0.0.0" +dependencies = [ + "thiserror", +] + +[[package]] +name = "lxutil" +version = "0.0.0" +dependencies = [ + "libc", + "lx", + "ntapi", + "pal", + "parking_lot", + "tempfile", + "tracing", + "widestring", + "winapi", + "zerocopy", +] + +[[package]] +name = "macaddr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" + +[[package]] +name = "make_imc_hive" +version = "0.0.0" +dependencies = [ + "anyhow", + "windows-sys 0.52.0", +] + +[[package]] +name = "mana_driver" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_device", + "futures", + "gdma", + "gdma_defs", + "getrandom", + "inspect", + "mesh", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "pci_core", + "test_with_tracing", + "tracing", + "user_driver", + "vmcore", + "zerocopy", +] + +[[package]] +name = "managed" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "mbrman" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c487024623ae38584610237dd1be8932bb2b324474b23c37a25f9fbe6bf5e9e" +dependencies = [ + "bincode", + "bitvec", + "serde", + "serde-big-array", + "thiserror", +] + +[[package]] +name = "mcr_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "vm_resource", +] + +[[package]] +name = "membacking" +version = "0.0.0" +dependencies = [ + "futures", + "getrandom", + "guestmem", + "hvdef", + "inspect", + "memory_range", + "mesh", + "pal_async", + "parking_lot", + "slab", + "sparse_mmap", + "thiserror", + "tracing", + "virt", + "vm_topology", + "vmcore", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc", +] + +[[package]] +name = "memory_range" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh_protobuf", + "thiserror", +] + +[[package]] +name = "mesh" +version = "0.0.0" +dependencies = [ + "mesh_channel", + "mesh_derive", + "mesh_node", + "mesh_protobuf", +] + +[[package]] +name = "mesh_build" +version = "0.0.0" +dependencies = [ + "heck", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "mesh_channel" +version = "0.0.0" +dependencies = [ + "futures", + "futures-concurrency", + "futures-core", + "futures-io", + "mesh_node", + "mesh_protobuf", + "pal_async", + "pal_event", + "parking_lot", + "test_with_tracing", + "thiserror", + "tracing", +] + +[[package]] +name = "mesh_derive" +version = "0.0.0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "mesh_node" +version = "0.0.0" +dependencies = [ + "futures-channel", + "getrandom", + "mesh_derive", + "mesh_protobuf", + "open_enum", + "pal", + "pal_async", + "parking_lot", + "test_with_tracing", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "mesh_process" +version = "0.0.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "debug_ptr", + "futures", + "futures-concurrency", + "inspect", + "inspect_rlimit", + "inspect_task", + "mesh", + "mesh_remote", + "pal", + "pal_async", + "slab", + "tracing", + "unicycle", +] + +[[package]] +name = "mesh_protobuf" +version = "0.0.0" +dependencies = [ + "diff", + "fs-err", + "heck", + "mesh_derive", + "prost", + "prost-build", + "prost-types", + "socket2", + "thiserror", + "zerocopy", +] + +[[package]] +name = "mesh_remote" +version = "0.0.0" +dependencies = [ + "futures", + "futures-concurrency", + "libc", + "mesh_channel", + "mesh_node", + "mesh_protobuf", + "ntapi", + "open_enum", + "pal", + "pal_async", + "pal_event", + "parking_lot", + "socket2", + "test_with_tracing", + "thiserror", + "tracing", + "tracing_helpers", + "unicycle", + "unix_socket", + "zerocopy", +] + +[[package]] +name = "mesh_rpc" +version = "0.0.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "env_logger", + "futures", + "futures-concurrency", + "h2", + "http", + "mesh", + "mesh_build", + "pal_async", + "parking_lot", + "prost", + "prost-build", + "prost-types", + "test_with_tracing", + "thiserror", + "tokio", + "tracing", + "unicycle", + "unix_socket", + "urlencoding", + "zerocopy", +] + +[[package]] +name = "mesh_tracing" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "inspect", + "mesh", + "pal_async", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mesh_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "futures-concurrency", + "inspect", + "linkme", + "mesh", + "pal_async", + "test_with_tracing", + "tracing", + "unicycle", +] + +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "minimal_rt" +version = "0.0.0" +dependencies = [ + "arrayvec", + "cfg-if", + "hvdef", + "minimal_rt_build", + "zerocopy", +] + +[[package]] +name = "minimal_rt_build" +version = "0.0.0" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "missing_dev" +version = "0.0.0" +dependencies = [ + "chipset_device", + "chipset_device_resources", + "inspect", + "missing_dev_resources", + "pci_core", + "vm_resource", + "vmcore", +] + +[[package]] +name = "missing_dev_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "ms-tpm-20-ref" +version = "0.1.0" +source = "git+https://github.com/microsoft/ms-tpm-20-ref-rs.git?branch=main#3e9d3874fe9273056c8e6806fc1f35493e7bdfad" +dependencies = [ + "cc", + "once_cell", + "openssl-sys", + "postcard", + "serde", + "tracing", + "walkdir", +] + +[[package]] +name = "mshv-bindings" +version = "0.1.1" +source = "git+https://github.com/rust-vmm/mshv?branch=main#7bacc75e3612fcb9c11bc7526414d70d04aa158e" +dependencies = [ + "libc", + "serde", + "serde_derive", + "vmm-sys-util", + "zerocopy", +] + +[[package]] +name = "mshv-ioctls" +version = "0.1.1" +source = "git+https://github.com/rust-vmm/mshv?branch=main#7bacc75e3612fcb9c11bc7526414d70d04aa158e" +dependencies = [ + "libc", + "mshv-bindings", + "vmm-sys-util", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[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 = "net_backend" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "memory_range", + "mesh", + "net_backend_resources", + "pal_async", + "parking_lot", + "tracing", + "vm_resource", + "vm_topology", +] + +[[package]] +name = "net_backend_resources" +version = "0.0.0" +dependencies = [ + "guid", + "inspect", + "mesh", + "thiserror", + "vm_resource", +] + +[[package]] +name = "net_consomme" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "consomme", + "inspect", + "inspect_counters", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "tracing", + "vm_resource", +] + +[[package]] +name = "net_dio" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guid", + "inspect", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "tracing", + "vm_resource", + "vmswitch", +] + +[[package]] +name = "net_mana" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chipset_device", + "futures", + "gdma", + "gdma_defs", + "guestmem", + "inspect", + "mana_driver", + "mesh", + "net_backend", + "pal_async", + "pci_core", + "test_with_tracing", + "tracelimit", + "tracing", + "user_driver", + "vmcore", + "zerocopy", +] + +[[package]] +name = "net_packet_capture" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "mesh", + "net_backend", + "parking_lot", + "pcap-file", + "tracing", +] + +[[package]] +name = "net_tap" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "inspect", + "libc", + "linux_net_bindings", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "thiserror", + "tracing", + "vm_resource", +] + +[[package]] +name = "netvsp" +version = "0.0.0" +dependencies = [ + "anyhow", + "arrayvec", + "async-trait", + "bitfield-struct", + "event-listener", + "futures", + "futures-concurrency", + "guestmem", + "guid", + "hvdef", + "inspect", + "inspect_counters", + "mesh", + "net_backend", + "net_backend_resources", + "netvsp_resources", + "open_enum", + "pal_async", + "parking_lot", + "safeatomic", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_ring", + "vmcore", + "zerocopy", +] + +[[package]] +name = "netvsp_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "net_backend_resources", + "vm_resource", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "nvme" +version = "0.0.0" +dependencies = [ + "async-trait", + "chipset_device", + "device_emulators", + "disk_backend", + "event-listener", + "futures", + "futures-concurrency", + "guestmem", + "guid", + "inspect", + "mesh", + "nvme_common", + "nvme_resources", + "nvme_spec", + "pal_async", + "parking_lot", + "pci_core", + "pci_resources", + "scsi_buffers", + "task_control", + "thiserror", + "tracelimit", + "tracing", + "unicycle", + "user_driver", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "nvme_common" +version = "0.0.0" +dependencies = [ + "disk_backend", + "nvme_spec", + "thiserror", +] + +[[package]] +name = "nvme_driver" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_device", + "disk_ramdisk", + "event-listener", + "futures", + "guestmem", + "guid", + "inspect", + "inspect_counters", + "mesh", + "nvme", + "nvme_spec", + "pal_async", + "parking_lot", + "pci_core", + "safeatomic", + "scsi_buffers", + "slab", + "task_control", + "test_with_tracing", + "thiserror", + "tracing", + "user_driver", + "vmcore", + "zerocopy", +] + +[[package]] +name = "nvme_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "vm_resource", +] + +[[package]] +name = "nvme_spec" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "inspect", + "open_enum", + "storage_string", + "zerocopy", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "ohcldiag-dev" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "clap_dyn_complete", + "ctrlc", + "diag_client", + "env_logger", + "fs-err", + "futures", + "futures-concurrency", + "inspect", + "kmsg", + "mesh", + "pal", + "pal_async", + "socket2", + "term", + "thiserror", + "unicycle", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "open-enum" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb2508143a400b3361812094d987dd5adc81f0f5294a46491be648d6c94cab5" +dependencies = [ + "open-enum-derive", +] + +[[package]] +name = "open-enum-derive" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1296fab5231654a5aec8bf9e87ba4e3938c502fc4c3c0425a00084c78944be" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "open_enum" +version = "0.0.0" + +[[package]] +name = "openhcl_boot" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "arrayvec", + "cfg-if", + "crc32fast", + "fdt", + "host_fdt_parser", + "hvdef", + "igvm_defs", + "loader_defs", + "memory_range", + "minimal_rt", + "minimal_rt_build", + "safe_x86_intrinsics", + "sha2", + "sidecar_defs", + "tdcall", + "underhill_confidentiality", + "x86defs", + "zerocopy", +] + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.4.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 2.0.48", +] + +[[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 = "300.2.1+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "openssl_crypto_only" +version = "0.0.0" + +[[package]] +name = "openssl_kdf" +version = "0.0.0" +dependencies = [ + "libc", + "openssl", + "openssl-sys", + "thiserror", +] + +[[package]] +name = "openvmm" +version = "0.0.0" +dependencies = [ + "hvlite_entry", + "openvmm_resources", + "win_prng_support", +] + +[[package]] +name = "openvmm_hcl" +version = "0.0.0" +dependencies = [ + "openvmm_hcl_resources", + "underhill_entry", +] + +[[package]] +name = "openvmm_hcl_resources" +version = "0.0.0" +dependencies = [ + "build_rs_guest_arch", + "chipset", + "debug_worker", + "disk_striped", + "hyperv_ic", + "mesh_worker", + "missing_dev", + "nvme", + "scsidisk", + "serial_16550", + "serial_core", + "serial_pl011", + "storvsp", + "tpm", + "uidevices", + "vm_resource", + "vmbus_serial_guest", + "vmcore", + "vmsocket", + "vnc_worker", +] + +[[package]] +name = "openvmm_resources" +version = "0.0.0" +dependencies = [ + "build_rs_guest_arch", + "chipset", + "debug_worker", + "disk_blob", + "disk_file", + "disk_prwrap", + "disk_ramdisk", + "disk_vhd1", + "disk_vhdmp", + "gdma", + "guest_crash_device", + "guest_emulation_device", + "guest_emulation_log", + "hvlite_core", + "hyperv_ic", + "mesh_worker", + "missing_dev", + "net_backend", + "net_consomme", + "net_dio", + "net_tap", + "netvsp", + "nvme", + "scsidisk", + "serial_16550", + "serial_core", + "serial_pl011", + "serial_socket", + "storvsp", + "tpm", + "uidevices", + "virtio_net", + "virtio_p9", + "virtio_pmem", + "virtiofs", + "vm_resource", + "vmbfs", + "vmbus_serial_host", + "vmcore", + "vnc_worker", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "oversized_box" +version = "0.0.0" + +[[package]] +name = "page_table" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "tracing", + "zerocopy", +] + +[[package]] +name = "pal" +version = "0.0.0" +dependencies = [ + "caps", + "fs-err", + "getrandom", + "landlock", + "libc", + "ntapi", + "pal_event", + "seccompiler", + "socket2", + "thiserror", + "tracing", + "widestring", + "win_import_lib", + "winapi", +] + +[[package]] +name = "pal_async" +version = "0.0.0" +dependencies = [ + "async-channel", + "async-task", + "cfg-if", + "futures", + "getrandom", + "libc", + "once_cell", + "pal", + "pal_async_test", + "pal_event", + "parking_lot", + "slab", + "smallbox", + "socket2", + "tempfile", + "tempfile_helpers", + "unicycle", + "unix_socket", + "winapi", + "windows-sys 0.52.0", + "zerocopy", +] + +[[package]] +name = "pal_async_test" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pal_event" +version = "0.0.0" +dependencies = [ + "getrandom", + "libc", + "mesh_protobuf", + "windows-sys 0.52.0", +] + +[[package]] +name = "pal_uring" +version = "0.0.0" +dependencies = [ + "futures", + "inspect", + "io-uring", + "libc", + "once_cell", + "pal", + "pal_async", + "parking_lot", + "slab", + "smallbox", + "tempfile", + "test_with_tracing", + "tracing", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pbjson" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048f9ac93c1eab514f9470c4bc8d97ca2a0a236b84f45cc19d69a59fc11467f6" +dependencies = [ + "base64 0.13.1", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.5.1" +source = "git+https://github.com/jstarks/pbjson?branch=aliases#8896d740a44ef46a3bad8cbfccedb87ea8e7b0d3" +dependencies = [ + "heck", + "itertools", + "prost", + "prost-types", +] + +[[package]] +name = "pbjson-types" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a88c8d87f99a4ac14325e7a4c24af190fca261956e3b82dd7ed67e77e6c7043" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "serde", +] + +[[package]] +name = "pcap-file" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc1f139757b058f9f37b76c48501799d12c9aa0aa4c0d4c980b062ee925d1b2" +dependencies = [ + "byteorder_slice", + "derive-into-owned", + "thiserror", +] + +[[package]] +name = "pci_bus" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "chipset_device", + "inspect", + "mesh", + "thiserror", + "tracelimit", + "tracing", + "vmcore", + "zerocopy", +] + +[[package]] +name = "pci_core" +version = "0.0.0" +dependencies = [ + "bitflags 1.3.2", + "chipset_device", + "guestmem", + "inspect", + "mesh", + "open_enum", + "parking_lot", + "thiserror", + "tracelimit", + "tracing", + "vmcore", + "zerocopy", +] + +[[package]] +name = "pci_resources" +version = "0.0.0" +dependencies = [ + "chipset_device", + "chipset_device_resources", + "guestmem", + "pci_core", + "vm_resource", + "vmcore", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "petri" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_resources", + "diag_client", + "disk_backend_resources", + "fatfs", + "framebuffer", + "fs-err", + "fscommon", + "futures", + "futures-concurrency", + "get_resources", + "gptman", + "guid", + "hvlite_defs", + "hvlite_helpers", + "hvlite_pcat_locator", + "hyperv_ic_resources", + "hyperv_secure_boot_templates", + "ide_resources", + "image", + "inspect", + "mbrman", + "mesh", + "mesh_process", + "mesh_worker", + "nvme_resources", + "pal", + "pal_async", + "petri_artifacts_common", + "petri_artifacts_core", + "petri_artifacts_vmm_test", + "pipette_client", + "prost", + "scsidisk_resources", + "serial_16550_resources", + "serial_core", + "serial_socket", + "sparse_mmap", + "storvsp_resources", + "tempfile", + "tempfile_helpers", + "tpm_resources", + "tracing", + "tracing-subscriber", + "uidevices_resources", + "underhill_confidentiality", + "unix_socket", + "video_core", + "vm_manifest_builder", + "vm_resource", + "vmbfs_resources", + "vmbus_serial_resources", + "vmcore", + "vmm_core_defs", + "vmotherboard", + "vtl2_settings_proto", +] + +[[package]] +name = "petri_artifact_resolver_openvmm_known_paths" +version = "0.0.0" +dependencies = [ + "anyhow", + "petri_artifacts_common", + "petri_artifacts_core", + "petri_artifacts_vmm_test", + "tempfile", + "vmm_test_images", +] + +[[package]] +name = "petri_artifacts_common" +version = "0.0.0" +dependencies = [ + "petri_artifacts_core", +] + +[[package]] +name = "petri_artifacts_core" +version = "0.0.0" +dependencies = [ + "anyhow", + "paste", +] + +[[package]] +name = "petri_artifacts_vmm_test" +version = "0.0.0" +dependencies = [ + "petri_artifacts_common", + "petri_artifacts_core", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pipette" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "futures-concurrency", + "mesh", + "mesh_remote", + "pal_async", + "pipette_protocol", + "tracing", + "tracing-subscriber", + "unicycle", + "vmsocket", + "windows-service", + "windows-sys 0.52.0", +] + +[[package]] +name = "pipette_client" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "futures-concurrency", + "mesh", + "mesh_remote", + "pal_async", + "pipette_protocol", + "tracing", + "typed-path", + "xshell-macros", +] + +[[package]] +name = "pipette_protocol" +version = "0.0.0" +dependencies = [ + "mesh", +] + +[[package]] +name = "pkg-config" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + +[[package]] +name = "plan9" +version = "0.0.0" +dependencies = [ + "lx", + "lxutil", + "parking_lot", + "tracing", +] + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "power_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiler_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "mesh", + "mesh_worker", + "pal_async", + "socket2", + "tracing", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which 4.4.2", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "ptr_meta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "range_map_vec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc2191ec1fd850e3ede4cf09ccfd40a33df561111f73e96e1b7c3f9eee31328" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "quick-error", +] + +[[package]] +name = "rlimit" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" +dependencies = [ + "libc", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustyline" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "clipboard-win", + "fd-lock", + "home", + "libc", + "log", + "memchr", + "nix 0.27.1", + "radix_trie", + "rustyline-derive", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi", +] + +[[package]] +name = "rustyline-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5af959c8bf6af1aff6d2b463a57f71aae53d1332da58419e30ad8dc7011d951" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safe_x86_intrinsics" +version = "0.0.0" + +[[package]] +name = "safeatomic" +version = "0.0.0" +dependencies = [ + "zerocopy", +] + +[[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 = "save_restore_derive" +version = "0.0.0" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "schema_ado_yaml" +version = "0.0.0" +dependencies = [ + "serde", + "serde_yaml", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scsi_buffers" +version = "0.0.0" +dependencies = [ + "event-listener", + "guestmem", + "safeatomic", + "smallvec", + "zerocopy", +] + +[[package]] +name = "scsi_core" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "scsi_buffers", + "scsi_defs", + "stackfuture", + "vm_resource", + "vmcore", +] + +[[package]] +name = "scsi_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "zerocopy", +] + +[[package]] +name = "scsidisk" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "disk_backend", + "disk_prwrap", + "futures", + "getrandom", + "guestmem", + "guid", + "hvdef", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "scsi_buffers", + "scsi_core", + "scsi_defs", + "scsidisk_resources", + "stackfuture", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "scsidisk_resources" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "storage_string", + "vm_resource", +] + +[[package]] +name = "seccompiler" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5" +dependencies = [ + "libc", +] + +[[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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-big-array" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3323f09a748af288c3dc2474ea6803ee81f118321775bffa3ac8f7e65c5e90e7" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_helpers" +version = "0.0.0" +dependencies = [ + "base64 0.21.7", + "guid", + "serde", + "serde_json", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "serial_16550" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "futures", + "inspect", + "inspect_counters", + "mesh", + "open_enum", + "serial_16550_resources", + "serial_core", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", +] + +[[package]] +name = "serial_16550_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "serial_core" +version = "0.0.0" +dependencies = [ + "futures", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "vm_resource", +] + +[[package]] +name = "serial_pl011" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "futures", + "inspect", + "inspect_counters", + "mesh", + "open_enum", + "pal_async", + "serial_core", + "serial_pl011_resources", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", +] + +[[package]] +name = "serial_pl011_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "serial_socket" +version = "0.0.0" +dependencies = [ + "futures", + "inspect", + "mesh", + "pal", + "pal_async", + "serial_core", + "tracing", + "unix_socket", + "vm_resource", +] + +[[package]] +name = "sev_guest_device" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "nix 0.26.4", + "static_assertions", + "thiserror", + "zerocopy", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_pool_alloc" +version = "0.0.0" +dependencies = [ + "anyhow", + "hcl", + "hvdef", + "inspect", + "parking_lot", + "sparse_mmap", + "thiserror", + "tracing", + "user_driver", + "vm_topology", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "sidecar" +version = "0.0.0" +dependencies = [ + "arrayvec", + "hvdef", + "memory_range", + "minimal_rt", + "minimal_rt_build", + "sidecar_defs", + "x86defs", + "zerocopy", +] + +[[package]] +name = "sidecar_client" +version = "0.0.0" +dependencies = [ + "fs-err", + "hvdef", + "libc", + "nix 0.26.4", + "pal_async", + "parking_lot", + "sidecar_defs", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "sidecar_defs" +version = "0.0.0" +dependencies = [ + "hvdef", + "open_enum", + "x86defs", + "zerocopy", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallbox" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92359f97e6b417da4328a970cf04a044db104fbd57f7d72cb7ff665bb8806af" + +[[package]] +name = "smallvec" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" + +[[package]] +name = "smoltcp" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee34c1e1bfc7e9206cc0fb8030a90129b4e319ab53856249bb27642cab914fb3" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "managed", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sparse_mmap" +version = "0.0.0" +dependencies = [ + "cc", + "criterion", + "getrandom", + "libc", + "pal", + "parking_lot", + "thiserror", + "windows-sys 0.52.0", + "zerocopy", +] + +[[package]] +name = "stackfuture" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eae92052b72ef70dafa16eddbabffc77e5ca3574be2f7bc1127b36f0a7ad7f2" + +[[package]] +name = "state_unit" +version = "0.0.0" +dependencies = [ + "anyhow", + "event-listener", + "futures", + "futures-concurrency", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "test_with_tracing", + "thiserror", + "tracing", + "vmcore", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "storage_string" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh_protobuf", + "thiserror", + "zerocopy", +] + +[[package]] +name = "storvsp" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "criterion", + "disk_backend", + "disk_ramdisk", + "event-listener", + "fast_select", + "futures", + "guestmem", + "guid", + "inspect", + "inspect_counters", + "mesh", + "open_enum", + "oversized_box", + "pal_async", + "parking_lot", + "scsi_buffers", + "scsi_core", + "scsi_defs", + "scsidisk", + "slab", + "storvsp_resources", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "unicycle", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_ring", + "vmcore", + "zerocopy", +] + +[[package]] +name = "storvsp_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "vm_resource", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +dependencies = [ + "serde", +] + +[[package]] +name = "task_control" +version = "0.0.0" +dependencies = [ + "fast_select", + "futures", + "inspect", + "pal_async", + "parking_lot", +] + +[[package]] +name = "tdcall" +version = "0.0.0" +dependencies = [ + "hvdef", + "memory_range", + "tracing", + "x86defs", +] + +[[package]] +name = "tdx_guest_device" +version = "0.0.0" +dependencies = [ + "nix 0.26.4", + "static_assertions", + "thiserror", + "zerocopy", +] + +[[package]] +name = "tee_call" +version = "0.0.0" +dependencies = [ + "sev_guest_device", + "static_assertions", + "tdx_guest_device", + "thiserror", + "zerocopy", +] + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tempfile_helpers" +version = "0.0.0" +dependencies = [ + "tempfile", +] + +[[package]] +name = "term" +version = "0.0.0" +dependencies = [ + "crossterm", + "libc", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test_with_tracing" +version = "0.0.0" +dependencies = [ + "log", + "test_with_tracing_macro", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "test_with_tracing_macro" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[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.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tpm" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "getrandom", + "guestmem", + "inspect", + "mesh", + "ms-tpm-20-ref", + "open_enum", + "pal_async", + "parking_lot", + "thiserror", + "tpm_resources", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "tpm_resources" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "vm_resource", +] + +[[package]] +name = "tracelimit" +version = "0.0.0" +dependencies = [ + "parking_lot", + "tracing", +] + +[[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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log 0.2.0", + "tracing-serde", +] + +[[package]] +name = "tracing_helpers" +version = "0.0.0" +dependencies = [ + "anyhow", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typed-path" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a90726108dab678edab76459751e1cc7c597c3484a6384d6423191255fa641b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucs2" +version = "0.0.0" +dependencies = [ + "mesh_protobuf", + "thiserror", +] + +[[package]] +name = "ucs2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df79298e11f316400c57ec268f3c2c29ac3c4d4777687955cd3d4f3a35ce7eba" +dependencies = [ + "bit_field", +] + +[[package]] +name = "uefi" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91f17ea8502a6bd414acb2bf5194f90ca4c48e33a2d18cb57eab3294d2050d99" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "log", + "ptr_meta", + "ucs2 0.3.3", + "uefi-macros", + "uefi-raw", + "uguid", +] + +[[package]] +name = "uefi-macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19ee3a01d435eda42cb9931269b349d28a1762f91ddf01c68d276f74b957cc3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "uefi-raw" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b463030b802e1265a3800fab24df95d3229c202c2e408832a206f05b4d1496ca" +dependencies = [ + "bitflags 2.4.2", + "ptr_meta", + "uguid", +] + +[[package]] +name = "uefi_nvram_specvars" +version = "0.0.0" +dependencies = [ + "guid", + "thiserror", + "ucs2 0.0.0", + "uefi_specs", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "uefi_nvram_storage" +version = "0.0.0" +dependencies = [ + "async-trait", + "guid", + "inspect", + "pal_async", + "thiserror", + "ucs2 0.0.0", + "uefi_specs", + "wchar", + "zerocopy", +] + +[[package]] +name = "uefi_specs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guid", + "inspect", + "open_enum", + "static_assertions", + "ucs2 0.0.0", + "wchar", + "zerocopy", +] + +[[package]] +name = "uevent" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "futures-concurrency", + "libc", + "mesh", + "pal_async", + "socket2", + "thiserror", + "tracing", +] + +[[package]] +name = "uguid" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab14ea9660d240e7865ce9d54ecdbd1cd9fa5802ae6f4512f093c7907e921533" + +[[package]] +name = "uidevices" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "guestmem", + "guid", + "input_core", + "inspect", + "mesh", + "pal_async", + "static_assertions", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "uidevices_resources", + "video_core", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "uidevices_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "underhill_attestation" +version = "0.0.0" +dependencies = [ + "base64 0.21.7", + "base64-serde", + "get_protocol", + "getrandom", + "guest_emulation_transport", + "guid", + "hex", + "mesh", + "open_enum", + "openssl", + "openssl_kdf", + "pal_async", + "serde", + "serde_json", + "sev_guest_device", + "static_assertions", + "tdx_guest_device", + "tee_call", + "thiserror", + "time", + "tracing", + "vmgs", + "zerocopy", +] + +[[package]] +name = "underhill_confidentiality" +version = "0.0.0" + +[[package]] +name = "underhill_config" +version = "0.0.0" +dependencies = [ + "guid", + "inspect", + "mesh", + "prost", + "serde", + "serde_json", + "thiserror", + "vtl2_settings_proto", +] + +[[package]] +name = "underhill_core" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "acpi_spec", + "anyhow", + "async-trait", + "blocking", + "bootloader_fdt_parser", + "build_info", + "build_rs_guest_arch", + "cfg-if", + "chipset", + "chipset_device", + "chipset_device_resources", + "chipset_legacy", + "closeable_mutex", + "cvm_tracing", + "debug_ptr", + "debug_worker_defs", + "diag_proto", + "diag_server", + "disk_backend", + "disk_backend_resources", + "disk_blockdevice", + "disk_nvme", + "firmware_pcat", + "firmware_uefi", + "firmware_uefi_custom_vars", + "framebuffer", + "fs-err", + "futures", + "futures-concurrency", + "get_helpers", + "get_protocol", + "getrandom", + "guest_emulation_transport", + "guestmem", + "guid", + "hcl", + "hcl_compat_uefi_nvram_storage", + "hvdef", + "hyperv_ic_guest", + "hyperv_ic_resources", + "hyperv_secure_boot_templates", + "hyperv_uefi_custom_vars_json", + "ide", + "ide_resources", + "igvm", + "igvm_defs", + "input_core", + "inspect", + "kmsg", + "kmsg_defs", + "libc", + "loader", + "loader_defs", + "local_clock", + "mana_driver", + "mcr_resources", + "memory_range", + "mesh", + "mesh_process", + "mesh_tracing", + "mesh_worker", + "net_backend", + "net_backend_resources", + "net_mana", + "net_packet_capture", + "netvsp", + "nvme_driver", + "nvme_resources", + "pal", + "pal_async", + "pal_uring", + "parking_lot", + "profiler_worker", + "safe_x86_intrinsics", + "scsi_buffers", + "scsi_core", + "scsidisk", + "scsidisk_resources", + "serde", + "serde_helpers", + "serde_json", + "serial_16550_resources", + "shared_pool_alloc", + "sidecar_client", + "socket2", + "sparse_mmap", + "state_unit", + "storage_string", + "storvsp", + "storvsp_resources", + "tee_call", + "thiserror", + "time", + "tpm", + "tpm_resources", + "tracelimit", + "tracing", + "tracing-subscriber", + "tracing_helpers", + "uevent", + "uidevices_resources", + "underhill_attestation", + "underhill_confidentiality", + "underhill_config", + "underhill_mem", + "underhill_threadpool", + "user_driver", + "vga_proxy", + "video_core", + "virt", + "virt_mshv_vtl", + "vm_loader", + "vm_manifest_builder", + "vm_resource", + "vm_topology", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_relay", + "vmbus_relay_intercept_device", + "vmbus_serial_guest", + "vmbus_server", + "vmbus_user_channel", + "vmcore", + "vmgs", + "vmgs_broker", + "vmgs_resources", + "vmm_core", + "vmm_core_defs", + "vmotherboard", + "vmsocket", + "vnc_worker_defs", + "vpci", + "watchdog_core", + "watchdog_vmgs_format", + "x86defs", + "zerocopy", +] + +[[package]] +name = "underhill_crash" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "get_protocol", + "guid", + "libc", + "pal_async", + "thiserror", + "tracing", + "tracing-subscriber", + "vergen", + "vmbus_async", + "vmbus_user_channel", + "zerocopy", +] + +[[package]] +name = "underhill_dump" +version = "0.0.0" +dependencies = [ + "anyhow", + "elfcore", + "libc", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "underhill_entry" +version = "0.0.0" +dependencies = [ + "anyhow", + "mimalloc", + "openssl_crypto_only", + "underhill_core", + "underhill_crash", + "underhill_dump", + "underhill_init", +] + +[[package]] +name = "underhill_init" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "kmsg_defs", + "libc", + "log", + "nix 0.26.4", + "underhill_confidentiality", + "vergen", + "walkdir", +] + +[[package]] +name = "underhill_mem" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "futures", + "guestmem", + "hcl", + "hvdef", + "inspect", + "memory_range", + "pal_async", + "parking_lot", + "sparse_mmap", + "thiserror", + "tracing", + "underhill_threadpool", + "virt_mshv_vtl", + "vm_topology", + "x86defs", +] + +[[package]] +name = "underhill_threadpool" +version = "0.0.0" +dependencies = [ + "fs-err", + "inspect", + "pal", + "pal_async", + "pal_uring", + "parking_lot", + "thiserror", + "tracing", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicycle" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfa5ca2452d3fbf68f7078c5e7f42b96f0c0c7def017994147f8acd8c4264d" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", + "pin-project", + "uniset", +] + +[[package]] +name = "uniset" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c9f21fe154ca4d5d06fc2ebb8c58cc80e338eacc372ec794943f69e535c131c" + +[[package]] +name = "unix_socket" +version = "0.0.0" +dependencies = [ + "getrandom", + "mesh_protobuf", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "user_driver" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_device", + "fs-err", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "inspect_counters", + "libc", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "pci_core", + "safeatomic", + "sparse_mmap", + "tracing", + "uevent", + "vfio-bindings", + "vfio_sys", + "vmcore", + "zerocopy", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vbs_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "igvm_defs", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +dependencies = [ + "anyhow", + "cfg-if", + "rustversion", + "time", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vfio-bindings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43449b404c488f70507dca193debd4bea361fe8089869b947adc19720e464bce" + +[[package]] +name = "vfio_sys" +version = "0.0.0" +dependencies = [ + "anyhow", + "bitfield-struct", + "libc", + "nix 0.26.4", + "tracing", + "vfio-bindings", +] + +[[package]] +name = "vga" +version = "0.0.0" +dependencies = [ + "chipset_device", + "framebuffer", + "guestmem", + "inspect", + "memory_range", + "open_enum", + "pal_async", + "parking_lot", + "pci_core", + "task_control", + "thiserror", + "tracing", + "video_core", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vga_proxy" +version = "0.0.0" +dependencies = [ + "async-trait", + "chipset_device", + "inspect", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "vhd1_defs" +version = "0.0.0" +dependencies = [ + "guid", + "zerocopy", +] + +[[package]] +name = "video_core" +version = "0.0.0" +dependencies = [ + "async-trait", + "inspect", + "mesh", + "vm_resource", +] + +[[package]] +name = "virt" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "build_rs_guest_arch", + "guestmem", + "hvdef", + "inspect", + "memory_range", + "mesh_protobuf", + "pal_event", + "parking_lot", + "pci_core", + "slab", + "thiserror", + "tracelimit", + "tracing", + "vm_topology", + "vmcore", + "x86defs", + "zerocopy", +] + +[[package]] +name = "virt_hvf" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "memory_range", + "open_enum", + "parking_lot", + "thiserror", + "tracelimit", + "tracing", + "virt", + "virt_support_gic", + "vmcore", +] + +[[package]] +name = "virt_kvm" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "bitfield-struct", + "build_rs_guest_arch", + "cfg-if", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "kvm", + "memory_range", + "open_enum", + "pal_event", + "parking_lot", + "pci_core", + "safe_x86_intrinsics", + "thiserror", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "vmcore", + "x86defs", + "zerocopy", +] + +[[package]] +name = "virt_mshv" +version = "0.0.0" +dependencies = [ + "arrayvec", + "build_rs_guest_arch", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "libc", + "mshv-bindings", + "mshv-ioctls", + "pal", + "pal_event", + "parking_lot", + "signal-hook", + "static_assertions", + "thiserror", + "tracelimit", + "tracing", + "virt", + "virt_support_x86emu", + "vmcore", + "vmm-sys-util", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virt_mshv_vtl" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "aarch64emu", + "anyhow", + "bitfield-struct", + "bitvec", + "build_rs_guest_arch", + "cfg-if", + "fs-err", + "guestmem", + "hcl", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "inspect_counters", + "libc", + "memory_range", + "mesh", + "pal", + "pal_async", + "pal_uring", + "parking_lot", + "pci_core", + "safe_x86_intrinsics", + "shared_pool_alloc", + "sidecar_client", + "thiserror", + "tracelimit", + "tracing", + "virt", + "virt_support_aarch64emu", + "virt_support_apic", + "virt_support_x86emu", + "vm_topology", + "vmcore", + "vtl_array", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virt_support_aarch64emu" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "aarch64emu", + "guestmem", + "hvdef", + "thiserror", + "tracing", + "virt", + "vm_topology", + "zerocopy", +] + +[[package]] +name = "virt_support_apic" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "hvdef", + "inspect", + "inspect_counters", + "parking_lot", + "thiserror", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "vmcore", + "x86defs", +] + +[[package]] +name = "virt_support_gic" +version = "0.0.0" +dependencies = [ + "inspect", + "open_enum", + "parking_lot", + "tracing", + "vm_topology", +] + +[[package]] +name = "virt_support_x86emu" +version = "0.0.0" +dependencies = [ + "guestmem", + "hvdef", + "iced-x86", + "pal_async", + "thiserror", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virt_whp" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "arrayvec", + "build_rs_guest_arch", + "chipset_device", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "inspect_counters", + "memory_range", + "mesh", + "pal_event", + "parking_lot", + "pci_core", + "range_map_vec", + "sparse_mmap", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "virt", + "virt_support_aarch64emu", + "virt_support_apic", + "virt_support_x86emu", + "vm_topology", + "vmcore", + "vtl_array", + "whp", + "winapi", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virtio" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "chipset_device", + "device_emulators", + "event-listener", + "futures", + "guestmem", + "inspect", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "pci_core", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "virtio_net" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "inspect_counters", + "mesh", + "net_backend", + "net_backend_resources", + "open_enum", + "pal_async", + "parking_lot", + "task_control", + "thiserror", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "virtio_p9" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guestmem", + "plan9", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", +] + +[[package]] +name = "virtio_pmem" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "event-listener", + "fs-err", + "guestmem", + "pal_async", + "sparse_mmap", + "task_control", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", + "vmcore", +] + +[[package]] +name = "virtio_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "net_backend_resources", + "vm_resource", +] + +[[package]] +name = "virtio_serial" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guestmem", + "parking_lot", + "tracing", + "virtio", +] + +[[package]] +name = "virtiofs" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "event-listener", + "fuse", + "futures", + "guestmem", + "lx", + "lxutil", + "ntapi", + "pal", + "pal_async", + "parking_lot", + "task_control", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vm_loader" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "guestmem", + "hvdef", + "loader", + "memory_range", + "range_map_vec", + "tracing", + "virt", + "vm_topology", +] + +[[package]] +name = "vm_manifest_builder" +version = "0.0.0" +dependencies = [ + "chipset_resources", + "input_core", + "mesh", + "missing_dev_resources", + "serial_16550_resources", + "serial_core", + "serial_pl011_resources", + "thiserror", + "vm_resource", + "vmotherboard", +] + +[[package]] +name = "vm_resource" +version = "0.0.0" +dependencies = [ + "async-trait", + "inspect", + "linkme", + "mesh", + "pal_async", + "thiserror", +] + +[[package]] +name = "vm_topology" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "build_rs_guest_arch", + "cfg-if", + "inspect", + "memory_range", + "mesh_protobuf", + "safe_x86_intrinsics", + "thiserror", + "x86defs", +] + +[[package]] +name = "vmbfs" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "guid", + "inspect", + "open_enum", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbfs_resources", + "vmbus_async", + "vmbus_channel", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vmbfs_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "vmbus_async" +version = "0.0.0" +dependencies = [ + "futures", + "guestmem", + "inspect", + "inspect_counters", + "pal_async", + "smallvec", + "thiserror", + "vmbus_channel", + "vmbus_ring", + "zerocopy", +] + +[[package]] +name = "vmbus_channel" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "guestmem", + "guid", + "inspect", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "task_control", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmbus_core", + "vmbus_ring", + "vmcore", +] + +[[package]] +name = "vmbus_client" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "thiserror", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "zerocopy", +] + +[[package]] +name = "vmbus_core" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "futures", + "guid", + "hvdef", + "inspect", + "mesh", + "open_enum", + "static_assertions", + "thiserror", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vmbus_proxy" +version = "0.0.0" +dependencies = [ + "guestmem", + "mesh", + "ntapi", + "pal", + "pal_async", + "pal_event", + "vmbus_core", + "winapi", + "zerocopy", +] + +[[package]] +name = "vmbus_relay" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "hcl", + "hvdef", + "inspect", + "mesh", + "mesh_protobuf", + "once_cell", + "pal_async", + "pal_event", + "parking_lot", + "tracelimit", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_client", + "vmbus_core", + "vmbus_server", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vmbus_relay_intercept_device" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "hcl", + "hvdef", + "inspect", + "mesh", + "pal_async", + "safeatomic", + "task_control", + "tracelimit", + "tracing", + "user_driver", + "virt", + "vmbus_channel", + "vmbus_client", + "vmbus_core", + "vmbus_relay", + "vmbus_ring", + "vmbus_server", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vmbus_ring" +version = "0.0.0" +dependencies = [ + "criterion", + "guestmem", + "inspect", + "safeatomic", + "smallvec", + "thiserror", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_guest" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "guid", + "inspect", + "inspect_counters", + "mesh", + "pal_async", + "serial_core", + "test_with_tracing", + "thiserror", + "tracing", + "unix_socket", + "vm_resource", + "vmbus_async", + "vmbus_serial_host", + "vmbus_serial_protocol", + "vmbus_user_channel", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_host" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "inspect", + "inspect_counters", + "serial_core", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmbus_serial_protocol", + "vmbus_serial_resources", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_protocol" +version = "0.0.0" +dependencies = [ + "guid", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "vmbus_server" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "guestmem", + "guid", + "hvdef", + "inspect", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "safeatomic", + "slab", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "unicycle", + "unix_socket", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_proxy", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vmbus_user_channel" +version = "0.0.0" +dependencies = [ + "filepath", + "fs-err", + "guid", + "libc", + "pal_async", + "parking_lot", + "safeatomic", + "sparse_mmap", + "thiserror", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "zerocopy", +] + +[[package]] +name = "vmcore" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "hvdef", + "inspect", + "linkme", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "save_restore_derive", + "slab", + "thiserror", + "time", + "tracelimit", + "tracing", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "vmfirmwareigvm_dll" +version = "0.0.0" +dependencies = [ + "embed-resource", +] + +[[package]] +name = "vmgs" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "cfg-if", + "crc32fast", + "getrandom", + "guid", + "inspect", + "inspect_counters", + "mesh_protobuf", + "openssl", + "pal_async", + "tempfile_helpers", + "thiserror", + "tracing", + "vhd1_defs", + "vmgs_format", + "windows", + "zerocopy", +] + +[[package]] +name = "vmgs_broker" +version = "0.0.0" +dependencies = [ + "async-trait", + "inspect", + "mesh_channel", + "pal_async", + "thiserror", + "tracing", + "vm_resource", + "vmcore", + "vmgs", + "vmgs_format", + "vmgs_resources", +] + +[[package]] +name = "vmgs_format" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "inspect", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "vmgs_lib" +version = "0.0.0" +dependencies = [ + "futures", + "vmgs", + "vmgs_format", +] + +[[package]] +name = "vmgs_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", + "vmgs_format", +] + +[[package]] +name = "vmgstool" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "clap", + "fs-err", + "guid", + "hcl_compat_uefi_nvram_storage", + "hex", + "pal_async", + "serde", + "serde_json", + "tempfile", + "thiserror", + "ucs2 0.0.0", + "uefi_nvram_specvars", + "uefi_nvram_storage", + "uefi_specs", + "vmgs", + "vmgs_format", +] + +[[package]] +name = "vmm-sys-util" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "vmm_core" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "acpi", + "acpi_spec", + "anyhow", + "async-trait", + "build_rs_guest_arch", + "cache_topology", + "chipset", + "futures", + "futures-concurrency", + "guestmem", + "hcl_compat_uefi_nvram_storage", + "hvdef", + "iced-x86", + "input_core", + "inspect", + "memory_range", + "mesh", + "pal_async", + "parking_lot", + "pci_core", + "pci_resources", + "power_resources", + "slab", + "state_unit", + "thiserror", + "tracing", + "virt", + "virt_support_x86emu", + "vm_resource", + "vm_topology", + "vmbus_channel", + "vmbus_server", + "vmcore", + "vmm_core_defs", + "vmotherboard", + "vpci", + "x86defs", + "zerocopy", +] + +[[package]] +name = "vmm_core_defs" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "virt", +] + +[[package]] +name = "vmm_test_images" +version = "0.0.0" +dependencies = [ + "clap", + "petri_artifacts_vmm_test", + "serde", +] + +[[package]] +name = "vmm_test_macros" +version = "0.0.0" +dependencies = [ + "petri_artifacts_common", + "petri_artifacts_vmm_test", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "vmm_test_petri_support" +version = "0.0.0" +dependencies = [ + "anyhow", + "parking_lot", + "petri", + "petri_artifacts_common", + "petri_artifacts_vmm_test", +] + +[[package]] +name = "vmm_tests" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "disk_backend_resources", + "gdma_resources", + "guid", + "hvlite_defs", + "hvlite_ttrpc_vmservice", + "mesh", + "mesh_rpc", + "net_backend_resources", + "nvme_resources", + "pal_async", + "petri", + "petri_artifact_resolver_openvmm_known_paths", + "petri_artifacts_common", + "petri_artifacts_vmm_test", + "scsidisk_resources", + "storvsp_resources", + "test_with_tracing", + "tracing", + "unix_socket", + "vm_resource", + "vmm_core_defs", + "vmm_test_macros", + "vmm_test_petri_support", + "vtl2_settings_proto", +] + +[[package]] +name = "vmotherboard" +version = "0.0.0" +dependencies = [ + "anyhow", + "arc_cyclic_builder", + "async-trait", + "chipset", + "chipset_device", + "chipset_device_resources", + "chipset_legacy", + "chipset_resources", + "closeable_mutex", + "firmware_pcat", + "firmware_uefi", + "floppy", + "floppy_pcat_stub", + "framebuffer", + "futures", + "generation_id", + "guest_watchdog", + "guestmem", + "ide", + "inspect", + "inspect_counters", + "local_clock", + "mesh", + "missing_dev", + "pal_async", + "parking_lot", + "paste", + "pci_bus", + "range_map_vec", + "state_unit", + "thiserror", + "tracelimit", + "tracing", + "uefi_nvram_storage", + "vga", + "vga_proxy", + "vm_resource", + "vmcore", + "watchdog_core", +] + +[[package]] +name = "vmsocket" +version = "0.0.0" +dependencies = [ + "cfg-if", + "guid", + "libc", + "mesh", + "pal_async", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "vmswitch" +version = "0.0.0" +dependencies = [ + "futures", + "getrandom", + "guid", + "pal", + "pal_async", + "pal_event", + "thiserror", + "tracing", + "widestring", + "winapi", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vnc" +version = "0.0.0" +dependencies = [ + "futures", + "pal_async", + "socket2", + "thiserror", + "zerocopy", +] + +[[package]] +name = "vnc_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "framebuffer", + "futures", + "input_core", + "inspect", + "mesh", + "mesh_worker", + "pal_async", + "tracing", + "tracing_helpers", + "vmsocket", + "vnc", + "vnc_worker_defs", +] + +[[package]] +name = "vnc_worker_defs" +version = "0.0.0" +dependencies = [ + "framebuffer", + "input_core", + "mesh", + "mesh_worker", + "vmsocket", +] + +[[package]] +name = "vpci" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "chipset_arc_mutex_device", + "chipset_device", + "closeable_mutex", + "device_emulators", + "guestmem", + "guid", + "hvdef", + "inspect", + "mesh", + "open_enum", + "pal_async", + "parking_lot", + "pci_core", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "vtl2_settings_proto" +version = "0.0.0" +dependencies = [ + "pbjson", + "pbjson-build", + "pbjson-types", + "prost", + "prost-build", + "serde", +] + +[[package]] +name = "vtl_array" +version = "0.0.0" +dependencies = [ + "bitvec", + "hvdef", + "inspect", +] + +[[package]] +name = "w32-error" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7c61a6bd91e168c12fc170985725340f6b458eb6f971d1cf6c34f74ffafb43" +dependencies = [ + "winapi", +] + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "watchdog_core" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "inspect", + "mesh", + "pal_async", + "thiserror", + "tracing", + "vmcore", +] + +[[package]] +name = "watchdog_vmgs_format" +version = "0.0.0" +dependencies = [ + "thiserror", + "vmcore", +] + +[[package]] +name = "wchar" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ca6ea80317e76471c3aa6d47efb151ef04538960ab810845a1c854f5cd7d8c" +dependencies = [ + "wchar-impl", +] + +[[package]] +name = "wchar-impl" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "075c93156fed21f9dab57af5e81604d0fdb67432c919a8c1f78bb979f06a3d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "which" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "whp" +version = "0.0.0" +dependencies = [ + "criterion", + "win_import_lib", + "winapi", + "zerocopy", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "win_etw_metadata" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50d0fa665033a19ecefd281b4fb5481eba2972dedbb5ec129c9392a206d652f" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "win_etw_provider" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f61e9dfafedf5eb4348902f2a32d326f2371245d05f012cdc67b9251ad6ea3" +dependencies = [ + "w32-error", + "widestring", + "win_etw_metadata", + "winapi", + "zerocopy", +] + +[[package]] +name = "win_etw_tracing" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d81ad6b448007f4445466a7aed270c56f05e64f5f996dc9a650b3d38c73e921" +dependencies = [ + "bytes", + "tracing", + "tracing-log 0.1.4", + "tracing-subscriber", + "win_etw_metadata", + "win_etw_provider", +] + +[[package]] +name = "win_import_lib" +version = "0.0.0" +dependencies = [ + "anyhow", + "cc", +] + +[[package]] +name = "win_prng_support" +version = "0.0.0" +dependencies = [ + "widestring", + "win_import_lib", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[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.48", +] + +[[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.48", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-service" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" +dependencies = [ + "bitflags 2.4.2", + "widestring", + "windows-sys 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x86defs" +version = "0.0.0" +dependencies = [ + "arbitrary", + "bitfield-struct", + "open_enum", + "zerocopy", +] + +[[package]] +name = "x86emu" +version = "0.0.0" +dependencies = [ + "arbitrary", + "futures", + "iced-x86", + "thiserror", + "tracing", + "x86defs", + "zerocopy", +] + +[[package]] +name = "xshell" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d47097dc5c85234b1e41851b3422dd6d19b3befdd35b4ae5ce386724aeca981" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88301b56c26dd9bf5c43d858538f82d6f3f7764767defbc5d34e59459901c41a" + +[[package]] +name = "xtask" +version = "0.0.0" +dependencies = [ + "anyhow", + "cargo_toml", + "ci_logger", + "clap", + "clap_dyn_complete", + "fatfs", + "fs-err", + "futures", + "glob", + "gptman", + "grep-regex", + "grep-searcher", + "guid", + "ignore", + "log", + "mbrman", + "rayon", + "serde", + "serde_json", + "toml_edit", + "vmm_test_images", + "walkdir", + "which 6.0.0", + "xshell", + "zerocopy", +] + +[[package]] +name = "xtask_fuzz" +version = "0.0.0" +dependencies = [ + "libfuzzer-sys", + "tracing-subscriber", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zerocopy_helpers" +version = "0.0.0" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvmm/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openvmm/package.nix new file mode 100644 index 0000000000..14e659cc14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openvmm/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + protobuf, +}: + +rustPlatform.buildRustPackage rec { + pname = "openvmm"; + version = "0-unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "openvmm"; + rev = "2e5acb8ab89b75d6ff59d537e9f21445d830386d"; + hash = "sha256-Fi5hDFV2SfpqJjXSc7YwlNDnoL5TTgiqmFMt+ls2Uu4="; + }; + + separateDebugInfo = true; + + env = { + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + PROTOC = "protoc"; + }; + nativeBuildInputs = [ + pkg-config + protobuf + ]; + buildInputs = [ + openssl + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "bitvec-1.1.0" = "sha256-uXOTbrGCSnl/F6IJPZuViZKXg4BEMG4+lVcLxK5KIwc="; + "ms-tpm-20-ref-0.1.0" = "sha256-eB3MWRlOPtxG55sLH7HIWzSjVEY05IIBZOltTpsGpnE="; + "mshv-bindings-0.1.1" = "sha256-CZEhFb9qDR260OFA/mlTldEMFlF8bhawVAxXFWqPIcU="; + "pbjson-build-0.5.1" = "sha256-itmY3c35O7j0Otb1qyr2IDUw1MBWOCB3WwyU60ajBO4="; + }; + }; + + meta = with lib; { + homepage = "https://github.com/microsoft/openvmm"; + description = "modular, cross-platform Virtual Machine Monitor (VMM), written in Rust"; + license = licenses.mit; + mainProgram = "openvmm"; + maintainers = with maintainers; [ astro ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/Cargo.lock index 0abdf26f72..61e7f98c4f 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/Cargo.lock @@ -4,18 +4,18 @@ 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", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -28,8 +28,8 @@ dependencies = [ [[package]] name = "alvr_common" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "anyhow", "backtrace", @@ -45,8 +45,8 @@ dependencies = [ [[package]] name = "alvr_events" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "alvr_common", "alvr_packets", @@ -57,8 +57,8 @@ dependencies = [ [[package]] name = "alvr_filesystem" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "dirs", "once_cell", @@ -66,8 +66,8 @@ dependencies = [ [[package]] name = "alvr_packets" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "alvr_common", "alvr_session", @@ -77,8 +77,8 @@ dependencies = [ [[package]] name = "alvr_session" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "alvr_common", "alvr_filesystem", @@ -140,9 +140,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" dependencies = [ "backtrace", ] @@ -155,17 +155,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[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", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -200,9 +200,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[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" dependencies = [ "bytemuck_derive", ] @@ -226,15 +226,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cc" -version = "1.1.16" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "shlex", ] @@ -247,9 +247,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -257,9 +257,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -269,9 +269,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -623,15 +623,15 @@ 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 = "glam" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a" dependencies = [ "mint", "serde", @@ -722,9 +722,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", @@ -800,9 +800,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_polyfill" @@ -871,9 +871,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "mdns-sd" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b18c39a781e986434d14398b94993f3d7659ea4b255a79b00ed40a31f4a97d" +checksum = "35d1967e64b4ca7bba8af2458d0b9dd50471d541959ca2120cb9cc965946ef61" dependencies = [ "flume", "if-addrs", @@ -902,11 +902,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -1061,7 +1061,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "oscavmgr" -version = "0.4.1" +version = "0.4.2" dependencies = [ "alvr_common", "alvr_events", @@ -1180,9 +1180,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "ppv-lite86" @@ -1263,9 +1263,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", ] @@ -1365,9 +1365,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -1390,11 +1390,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[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]] @@ -1418,9 +1418,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -1437,18 +1437,18 @@ dependencies = [ [[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", @@ -1786,24 +1786,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "url" diff --git a/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/package.nix b/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/package.nix index 5267ac08ff..ed74ddd5bc 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/oscavmgr/package.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "oscavmgr"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "galister"; repo = "oscavmgr"; rev = "refs/tags/v${version}"; - hash = "sha256-1cpisSevAU2zGNrpVEGvulBcWB5rWkWAIYI/0vjzRQE="; + hash = "sha256-mOa9eUI/p0ErePza6wXy1jUcHg5Q9tvC7/lThQabU94="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "alvr_common-20.10.0" = "sha256-2d5+9rxCpqgLMab7i1pLKaY1qSKRxzPI7pgh54rQBdg="; + "alvr_common-20.11.1" = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8="; "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw="; "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k="; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ou/outguess/package.nix b/third_party/nixpkgs/pkgs/by-name/ou/outguess/package.nix index 1a4bbb4403..5ead0d00fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ou/outguess/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ou/outguess/package.nix @@ -1,7 +1,8 @@ -{ fetchFromGitHub -, stdenv -, lib -, autoreconfHook +{ + fetchFromGitHub, + stdenv, + lib, + autoreconfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -11,12 +12,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = "outguess"; - rev = finalAttrs.version; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-yv01jquPTnVk9fd1tqAt1Lxis+ZHZqdG3NiTFxfoXAE="; }; nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; + configureFlags = [ "--with-generic-jconfig" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix index 7105dc8eae..80263ab640 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix +++ b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) src pname version; - hash = "sha256-FBJrVXTgKh8Op7TiZjA/i2LY2OOIKmqGR+GwGUecqVI="; + hash = "sha256-YTZ6uT1hcNSh+xhRvOq4q/opMOEksXT/MH3BgCnccrA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ov/ovn/package.nix b/third_party/nixpkgs/pkgs/by-name/ov/ovn/package.nix index e9c53a53e2..6f501da7d3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/ovn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "24.09.0"; + version = "24.09.1"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; rev = "refs/tags/v${version}"; - hash = "sha256-0KXr9oxZqIhPD0HIkDUECCjfEK50JkkJxx8xsZIoAnc="; + hash = "sha256-Fz/YNEbMZ2mB4Fv1nKE3H3XrihehYP7j0N3clnTJ5x8="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/pacu/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/pacu/package.nix index 0ee1f4f1c8..73bf7b1a79 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/pacu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/pacu/package.nix @@ -28,6 +28,7 @@ python.pkgs.buildPythonApplication rec { "sqlalchemy-utils" "sqlalchemy" "pycognito" + "qrcode" "urllib3" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix index 032bb9b5db..d7376dde22 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paper-clip"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Paper-Clip"; rev = "v${finalAttrs.version}"; - hash = "sha256-WCnWWVYaKq4U2RG3S4Xfja0NvreJIqU2VUJzpX7KI/E="; + hash = "sha256-Jdsx5ZhujP0SgEtr4NMbXsTkMYrkQj7Vs+SSYziWpiw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pa/pappl/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/pappl/package.nix new file mode 100644 index 0000000000..2e9ecc8150 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/pappl/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + avahi, + cups, + gnutls, + libjpeg, + libpng, + libusb1, + pkg-config, + withPAMSupport ? true, + pam, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "pappl"; + version = "1.4.7"; + + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = "pappl"; + rev = "refs/tags/v${version}"; + hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + cups + libjpeg + libpng + libusb1 + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # upstream mentions these are not needed for Mac + # see: https://github.com/michaelrsweet/pappl#requirements + avahi + gnutls + ] + ++ lib.optionals withPAMSupport [ + pam + ]; + + # testing requires some networking + # doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/pappl-makeresheader --help + ''; + + enableParallelBuilding = true; + + meta = { + description = "C-based framework/library for developing CUPS Printer Applications"; + changelog = "https://github.com/michaelrsweet/pappl/blob/v${version}/CHANGES.md"; + mainProgram = "pappl-makeresheader"; + homepage = "https://github.com/michaelrsweet/pappl"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; # should also work for darwin, but requires additional work + maintainers = [ lib.maintainers.NotAShelf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix index 93188ebfc5..b58f84ed10 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-Pr2h5iezn//oyvuUoq5B49wEL1cUXOHhHjR3ylMXowQ="; + hash = "sha256-eWOzK08ZlNORaRRtDumxOhsQWNXxk48jxcanwhEOChY="; }; - vendorHash = "sha256-6w49XQNElSHpOamEZNpvvr67vYrZYXy2Sm7dWMh6OiU="; + vendorHash = "sha256-x2w1HYrJo0HqyGGlIaxKqy1XYj/akQm0ijbYuK7qg58="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patroni/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix rename to third_party/nixpkgs/pkgs/by-name/pa/patroni/package.nix index 19739f2bcc..f0628394ad 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/patroni/package.nix @@ -1,21 +1,22 @@ { lib -, pythonPackages +, python3Packages , fetchFromGitHub , nixosTests +, nix-update-script }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "patroni"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; + sha256 = "sha256-urNTxaipM4wD+1fp7EFdT7/FGLq86O1nOfst7JyX0fc="; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ boto3 click consul @@ -34,7 +35,7 @@ pythonPackages.buildPythonApplication rec { ydiff ]; - nativeCheckInputs = with pythonPackages; [ + nativeCheckInputs = with python3Packages; [ flake8 mock pytestCheckHook @@ -47,8 +48,10 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "patroni" ]; - passthru.tests = { - patroni = nixosTests.patroni; + passthru = { + tests.patroni = nixosTests.patroni; + + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/pc/pcsx2-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcsx2-bin/package.nix index 6a343140ca..335cf8353f 100644 --- a/third_party/nixpkgs/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.136"; + version = "2.1.205"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-TAyOQLBOHOe+EBjirmST7Dmg6F13e/9SACr24/7FVgE="; + hash = "sha256-m5OSxAUBJhokNd7AamQJmkKSMYd1JRidHVYLHpyb0IQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix index 29bd775f66..10504f4ad0 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pdftitle"; - version = "0.14"; + version = "0.15"; pyproject = true; src = fetchFromGitHub { owner = "metebalci"; repo = "pdftitle"; rev = "v${version}"; - hash = "sha256-7tIvvRlaKRC3/eRUS8F3d3qiJnCU0Z14Pj9E4v0X4+o="; + hash = "sha256-IEctzvNHlGYUMl3jfTVNinmfMviVQ9q15OZtRN1mhZc="; }; build-system = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch b/third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch deleted file mode 100644 index 6659f2d084..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index fa15faad39e..7670e80931e 100644 ---- a/src/snes/tutorials/makefile -+++ b/src/snes/tutorials/makefile -@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o - # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed - testex5f: ex5f.PETSc - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ - if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ - echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ - else \ -@@ -25,6 +26,7 @@ testex5f: ex5f.PETSc - ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; - testex19: ex19.PETSc - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ - else \ -@@ -36,6 +38,7 @@ testex19: ex19.PETSc - ${RM} -f ex19_1.tmp; - testex19_mpi: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ - else \ -@@ -48,6 +51,7 @@ testex19_mpi: - #use unpreconditioned norm because HYPRE device installations use different AMG parameters - runex19_hypre: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \ - else \ -@@ -57,6 +61,7 @@ runex19_hypre: - ${RM} -f ex19_1.tmp - runex19_hypre_cuda: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \ - else \ -@@ -66,6 +71,7 @@ runex19_hypre_cuda: - ${RM} -f ex19_1.tmp - runex19_hypre_hip: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \ - else \ -@@ -75,6 +81,7 @@ runex19_hypre_hip: - ${RM} -f ex19_1.tmp - runex19_cuda: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \ - else \ -@@ -84,6 +91,7 @@ runex19_cuda: - ${RM} -f ex19_1.tmp - runex19_ml: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \ - else \ -@@ -93,6 +101,7 @@ runex19_ml: - ${RM} -f ex19_1.tmp - runex19_fieldsplit_mumps: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ - if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \ - else \ -@@ -102,6 +111,7 @@ runex19_fieldsplit_mumps: - ${RM} -f ex19_6.tmp - runex19_superlu_dist: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ - if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \ - else \ -@@ -111,6 +121,7 @@ runex19_superlu_dist: - ${RM} -f ex19.tmp - runex19_suitesparse: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \ - else \ -@@ -120,6 +131,7 @@ runex19_suitesparse: - ${RM} -f ex19_1.tmp - runex3k_kokkos: ex3k.PETSc - -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ - if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \ - else \ -diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile -index d1f047820ec..aab400535dd 100644 ---- a/src/vec/vec/tests/makefile -+++ b/src/vec/vec/tests/makefile -@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules - - runex47: ex47.PETSc - -@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \ - if (${DIFF} output/ex47_1.out ex47_1.tmp) then \ - echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \ - else \ diff --git a/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix index 498a14c96d..8d0db4a768 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix @@ -9,6 +9,7 @@ lapack, mpiSupport ? true, mpi, # generic mpi dependency + mpiCheckPhaseHook, openssh, # required for openmpi tests petsc-withp4est ? false, hdf5-support ? false, @@ -52,12 +53,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool ''; - # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): - # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. - # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory - # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. - patches = [ ./filter_mpi_warnings.patch ]; - configureFlags = [ "--with-blas=1" "--with-lapack=1" @@ -112,6 +107,7 @@ stdenv.mkDerivation rec { # the library is installed and available. doInstallCheck = true; installCheckTarget = "check_install"; + nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; passthru = { inherit mpiSupport; diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgrok/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgrok/package.nix index 0aed3b49f8..5da13036fe 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgrok/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgrok/package.nix @@ -29,7 +29,7 @@ buildGoModule { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-1PUcISW1pC9+5HZyI9SIDRyhos5f/6aW1wa2z0OKams="; + hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; }; vendorHash = "sha256-X5FjzliIJdfJnNaUXBjv1uq5tyjMVjBbnLCBH/P0LFM="; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix index 335b6256d9..0fe776b683 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pipet"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "pipet"; rev = version; - hash = "sha256-NhqrNehmL6LLLEOVT/s2PdQ7HtSCfoM4MST1IHVrJXE="; + hash = "sha256-pu+2sHdLz9TvYHBwvGTtFr/oAD+CreOR8io82YQANxc="; }; vendorHash = "sha256-jNIjF5jxcpNLAjuWo7OG/Ac4l6NpQNCKzYUgdAoL+C4="; diff --git a/third_party/nixpkgs/pkgs/by-name/pk/pkarr/package.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkarr/package.nix new file mode 100644 index 0000000000..afdc01723f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pk/pkarr/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + darwin, + rustPlatform, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "pkarr"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "pubky"; + repo = "pkarr"; + rev = "v${version}"; + hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks="; + }; + + cargoHash = "sha256-qRHxXlUDIpjhd/XeObnmEnjYk3SoiC56LWJUiut0BwY="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + SystemConfiguration + ] + ); + + meta = { + description = "Public Key Addressable Resource Records (sovereign TLDs) "; + homepage = "https://github.com/pubky/pkarr"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ dpc ]; + mainProgram = "pkarr-server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 2ee82abcf4..a60aab0957 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -4,27 +4,41 @@ fetchFromGitHub, cmake, kdePackages, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "0.5.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-+JweNB+zjbXh6Htyvu2vgogAr5Fl5wDPCpm6GV18NJ0="; + hash = "sha256-O+qIsYF0E+9LeiDcOUh8pZVY1rVoMlniju6yLact2Bc="; }; nativeBuildInputs = [ cmake kdePackages.extra-cmake-modules + ]; + + buildInputs = [ kdePackages.plasma-desktop ]; + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "INSTALL_PLASMOID" true) + (lib.cmakeBool "BUILD_PLUGIN" true) + (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6") + ]; + dontWrapQtApps = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fully-featured widget to bring Latte-Dock and WM status bar customization features to the default KDE Plasma panel"; homepage = "https://github.com/luisbocanegra/plasma-panel-colorizer"; diff --git a/third_party/nixpkgs/pkgs/by-name/po/pocketsphinx/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pocketsphinx/package.nix new file mode 100644 index 0000000000..0e37da28a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/pocketsphinx/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + cmake, + doxygen, + fetchFromGitHub, + gitUpdater, + graphviz, + gst_all_1, + pkg-config, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pocketsphinx"; + version = "5.0.3"; + + src = fetchFromGitHub { + owner = "cmusphinx"; + repo = "pocketsphinx"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-aCQpRmGHX08rA8UIt6Xf37XM34HysEzvcucLhL355k8="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + buildInputs = [ gst_all_1.gstreamer ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "BUILD_GSTREAMER" true) + (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "data"}/share") + ]; + + outputs = [ + "out" + "data" + "dev" + "lib" + "man" + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "Small speech recognizer"; + homepage = "https://github.com/cmusphinx/pocketsphinx"; + changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${finalAttrs.version}/NEWS"; + license = with licenses; [ + bsd2 + bsd3 + mit + ]; + pkgConfigModules = [ "pocketsphinx" ]; + mainProgram = "pocketsphinx"; + maintainers = with maintainers; [ jopejoe1 ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix index c92ea01778..6b21ebe353 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-ldFlW0QNjOvuJGyd2SzmMWA3ofS2ZW5krvCJRU83NXs="; + hash = "sha256-IINxDP0ajQdqbHTjeUeFqPbLTSCTl9gEhPxUWOe6zQs="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix b/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix index c73b6985f3..6d8d826007 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix @@ -9,7 +9,6 @@ makeDesktopItem, openjdk17, stdenvNoCC, - swt, webkitgtk_4_0, wrapGAppsHook3, gitUpdater, @@ -29,7 +28,6 @@ let glib-networking gtk3 libsecret - swt webkitgtk_4_0 ]; in @@ -56,7 +54,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --prefix CLASSPATH : "${swt}/jars/swt.jar" \ --prefix PATH : ${openjdk17}/bin # Create desktop item diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix index 0abf3996cb..c0b5c56fbc 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix @@ -11,6 +11,8 @@ let python = python3.override { self = python; packageOverrides = final: prev: { + django = prev.django_5; + django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec { version = "3.0.0"; src = oldAttrs.src.override { @@ -26,16 +28,22 @@ let # fails with some assertions doCheck = false; }); + + django-extensions = prev.django-extensions.overridePythonAttrs { + # Compat issues with Django 5.1 + # https://github.com/django-extensions/django-extensions/issues/1885 + doCheck = false; + }; }; }; - version = "2024.2.1"; + version = "2024.3.0"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; rev = "v${version}"; - hash = "sha256-D0ju9aOVy/new9GWqyFalZYCisdmM7irWSbn2TVCJYQ="; + hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU="; }; meta = with lib; { @@ -54,7 +62,7 @@ let sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; - npmDepsHash = "sha256-EAdeXdcC3gHun6BOHzvqpzv9+oDl1b/VTeNkYLiD+hA="; + npmDepsHash = "sha256-i7awRuR7NxhpxN2IZuI01PsN6FjXht7BxTbB1k039HA="; npmBuildScript = "build"; @@ -146,9 +154,6 @@ python.pkgs.buildPythonApplication rec { ++ plugins; optional-dependencies = { - mysql = with python.pkgs; [ - mysqlclient - ]; postgres = with python.pkgs; [ psycopg2 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/downstream.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/downstream.nix index ab94b50ac7..dd1465777a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/downstream.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/downstream.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-downstream"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-downstream"; rev = "v${version}"; - hash = "sha256-xpacfU655vg6g1rD4uteeizj+Bll4fgI0AEddaGiCLE="; + hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix index 82bcf966e7..c240be878a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-media-ccc-de"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-media-ccc-de"; rev = "v${version}"; - hash = "sha256-Cr9qbkb1VOH2EtDLSA5jmLiCnn1ICdvHnmTugCvHLc0="; + hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/pages.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/pages.nix index 67310f5387..76395ed666 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/pages.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/pages.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-pages"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-pages"; rev = "v${version}"; - hash = "sha256-wLMl+2hAJQksCyeBnXxMIFh1/Qkosm7PqByW6QxMsyg="; + hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index 0d66725c72..993bfd6def 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-public-voting"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-public-voting"; rev = "v${version}"; - hash = "sha256-1zxJ1b2CHfV2AVAneUJxurZ0L3QoMzuBf8c2wrj7yBA="; + hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/venueless.nix index 12f98f1749..7c138f07f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/venueless.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/venueless.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pretalx-venueless"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-venueless"; rev = "v${version}"; - hash = "sha256-llgRa18hxVoRSwU5UH6w4sE2W5ozCZm4Btbia2y0LbE="; + hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8="; }; nativeBuildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/vimeo.nix index a9a3d7903f..a6037ca3e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/vimeo.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/vimeo.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-vimeo"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-vimeo"; rev = "v${version}"; - hash = "sha256-ZlF/wWD5FaC4CfYIYvcbykPajoCOotmmaY+rQ0sGAo8="; + hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/youtube.nix index 8d9d008c98..b2b89acbd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/youtube.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/plugins/youtube.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-youtube"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-youtube"; rev = "v${version}"; - hash = "sha256-cTxkFSK84NRn7Z2uWYBJ2NvQ3pOsUbdZDg6XE5yswPg="; + hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix index ec6a4fc70f..66540cdfff 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix @@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec { "protobuf" "pyjwt" "python-bidi" + "qrcode" "requests" "sentry-sdk" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prettier-plugin-go-template/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prettier-plugin-go-template/package.nix index 79161f56c4..02edecce4a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prettier-plugin-go-template/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prettier-plugin-go-template/package.nix @@ -6,7 +6,7 @@ buildNpmPackage rec { pname = "prettier-plugin-go-template"; - version = "0-unstable-2023-07-26"; + version = "0.0.15-unstable-2023-07-26"; src = fetchFromGitHub { owner = "NiklasPor"; @@ -17,6 +17,15 @@ buildNpmPackage rec { npmDepsHash = "sha256-PpJnVZFRxpUHux2jIBDtyBS4qNo6IJY4kwTAq6stEVQ="; + dontNpmPrune = true; + + # Fixes error: Cannot find module 'prettier' + postInstall = '' + pushd "$nodeModulesPath" + find -mindepth 1 -maxdepth 1 -type d -print0 | grep --null-data -Exv "\./(ulid|prettier)" | xargs -0 rm -rfv + popd + ''; + meta = { description = "Fixes prettier formatting for go templates"; mainProgram = "prettier-plugin-go-template"; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix index ce95eb2469..6b935d5564 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "5.21.0"; + version = "5.21.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-i37Hiawmu/06Mv56FtYkvFGOtqW3x4Q2H1C0JW6/0pI="; + hash = "sha256-75TmTFl1EKLGE3kgghghary4Z2gjEjdguZ//ND3HAkc="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-o6m9Lxg+oqq15CtdA9RQRukdJWPPGtw/SwRyHDUf91A="; + hash = "sha256-fu2SJUn2xKm8lKNE8ncMRuNu6snj1J6cnHrJfzg+hJc="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index e5fb12a80c..b09f342e20 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -24,8 +24,8 @@ let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; repo = "libnbtplusplus"; - rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; - hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; + rev = "23b955121b8217c1c348a9ed2483167a6f3ff4ad"; + hash = "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk="; }; in @@ -35,13 +35,13 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "8.4"; + version = "9.0"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; - rev = finalAttrs.version; - hash = "sha256-460hB91M2hZm+uU1tywJEj20oRd5cz/NDvya8/vJdSA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-EFpZ3V8wm7q7iwUJg0kKdZzOviWKsCji0jgYrrrKSI0="; }; postUnpack = '' @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cmark ghc_filesystem kdePackages.qtbase + kdePackages.qtnetworkauth kdePackages.quazip tomlplusplus zlib @@ -90,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/") ]; + doCheck = true; + dontWrapQtApps = true; passthru = { @@ -104,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { their associated options with a simple interface. ''; homepage = "https://prismlauncher.org/"; - changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ minion3665 diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix index 83b1d4416a..8e5f9d295f 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix @@ -35,13 +35,13 @@ let pname = "pulsar"; - version = "1.121.0"; + version = "1.122.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-xouxKl4GTNZkT5wn8qbG2W2PbVAbsK9povmIL/Mikk4="; + x86_64-linux.hash = "sha256-Sx60cEQ2UAXqMujTaLkgN0Y3tIySg0TmaM0YroaX7nA="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-qRBX8jO5xDXkZ/6TWkgNa1NS3l+z8K/JyJDAa/3me5Q="; + aarch64-linux.hash = "sha256-Bhk1WZm9N771CC7j+TQsQCRSPwHOVTXCpleuhXC48K8="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix index b89d472dfb..decad3e4f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "pupdate"; rev = "${version}"; - hash = "sha256-GTdca47Jp/q1IpX1IAMZgOgHjBPNSotFSL9O6bfTfnM="; + hash = "sha256-ogQ7pYLfeyoxg0p7nxUvYhmgDw5xtd7qkFM08B4FDBU="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyfa/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyfa/package.nix new file mode 100644 index 0000000000..f056ee9e99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/py/pyfa/package.nix @@ -0,0 +1,31 @@ +{ + lib, + appimageTools, + fetchurl, +}: +let + version = "2.60.1"; +in +appimageTools.wrapType2 { + inherit version; + pname = "pyfa"; + + src = fetchurl { + name = "pyfa-appimage-${version}"; + url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage"; + hash = "sha256-+nyIG6pweIgC6ZiWJaO4E2Fp0/zP+DhQrUWzHnIBQXk="; + }; + + meta = { + description = "Python fitting assistant, cross-platform fitting tool for EVE Online"; + homepage = "https://github.com/pyfa-org/Pyfa"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + toasteruwu + cholli + ]; + mainProgram = "pyfa"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock index 9b0a4ca417..217016722d 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "autocfg" @@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.58" +version = "0.1.59-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab76dea4883a3e75fab38a6cd6c761346fec5909850c557fcbd683f7bd30b54e" +checksum = "a2f90c210a0919808e48b96ecffd370ac788386ab061203132872e9bf1ad9f7f" dependencies = [ "erg_common", "erg_compiler", @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.46" +version = "0.6.47-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cef7281a06474cd12e7eb653d164777023440b13a28c8834124770c4b8f65fa" +checksum = "d41f171eb77bf2763b119893966358ad9da72a3edd43cf278a78cf1c16daa2cf" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.46" +version = "0.6.47-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf1c1e83a364fafbcec194a27affd02bf4538740c34c1617c45d960d4a3e33c" +checksum = "93d0486bc668c120faf7af954dd4046224185c28821fb945a97eedcadf3e7d58" dependencies = [ "erg_common", "erg_parser", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.46" +version = "0.6.47-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c65037a0c9b890d8f810f7a827b897fba6ae950b34258b1450c9ab1e310813c" +checksum = "98c37f58f3aef2e765610e7281ada15dbba707beaa0262a71e7f6958ee058ed0" dependencies = [ "erg_common", "erg_proc_macros", @@ -195,9 +195,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.46" +version = "0.6.47-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d7235082b39bf55cdec52da8c010c2d2d9ff7d41dde051158b7815f560f321" +checksum = "97fa545f626fd04abea193a07c364c4fca3903c228bbe9cca4895500944b5aaf" dependencies = [ "quote", "syn 1.0.109", @@ -292,9 +292,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libm" @@ -554,16 +554,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] name = "py2erg" -version = "0.0.66" +version = "0.0.67" dependencies = [ "erg_common", "erg_compiler", @@ -573,7 +573,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.66" +version = "0.0.67" dependencies = [ "els", "erg_common", @@ -583,7 +583,7 @@ dependencies = [ [[package]] name = "pylyzer_core" -version = "0.0.66" +version = "0.0.67" dependencies = [ "erg_common", "erg_compiler", @@ -594,7 +594,7 @@ dependencies = [ [[package]] name = "pylyzer_wasm" -version = "0.0.66" +version = "0.0.67" dependencies = [ "erg_common", "erg_compiler", @@ -764,9 +764,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3" dependencies = [ "itoa", "memchr", diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix index 4e3b59a59c..c033e5c6c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.66"; + version = "0.0.67"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-vDeQ7IuECykBtcu4qvKKhcr/3vCXjN1JyL3/D4kwnng="; + hash = "sha256-UMNyztdcFr88wOpRMBtLigGJcxR+0uScN+8i0+WfeYU="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/qc/qcm/package.nix b/third_party/nixpkgs/pkgs/by-name/qc/qcm/package.nix index c3a6bd8ca4..9b8d9c92ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/qc/qcm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qc/qcm/package.nix @@ -1,27 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, qt6 -, curl -, ffmpeg -, cubeb +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + qt6, + curl, + ffmpeg, + cubeb, }: stdenv.mkDerivation (finalAttrs: { pname = "qcm"; - version = "1.0.5"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hypengw"; repo = "Qcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-/FOT2xK01JbJbTd5AT5Dk/5EF9qUyLvPTnw8PMtHYoQ="; + hash = "sha256-41GsG+NKCMw+LuRUf31ilRso/SkKYVV3IrMSviOZdWs="; }; - patches = [ ./remove_cubeb_vendor.patch ]; + patches = [ + ./remove_cubeb_vendor.patch + ]; nativeBuildInputs = [ cmake @@ -32,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6.qtbase qt6.qtdeclarative + qt6.qtsvg qt6.qtwayland curl ffmpeg @@ -40,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # Correct qml import path postInstall = '' - mkdir $out/lib/qt-6 - mv $out/lib/qml $out/lib/qt-6/qml + mv $out/lib/qt6 $out/lib/qt-6 ''; qtWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index db4d4cac92..ab0948a03e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -5,6 +5,7 @@ , python3 , binutils-unwrapped , findutils +, flashrom , gawk , kmod , pciutils @@ -52,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils + flashrom gawk kmod pciutils diff --git a/third_party/nixpkgs/pkgs/by-name/re/reader/package.nix b/third_party/nixpkgs/pkgs/by-name/re/reader/package.nix new file mode 100644 index 0000000000..2d9d5a16a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/reader/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +let + self = buildGoModule { + pname = "reader"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "mrusme"; + repo = "reader"; + rev = "v${self.version}"; + hash = "sha256-9hZ7ZS+p6PoLKcuHS2re537wxojN2SzhOm5gBuRX9Xc="; + }; + + vendorHash = "sha256-obYdifg3WrTyxgN/VtzgpL31ZOyPNtVT8UDQts0WodQ="; + + meta = { + description = "Lightweight tool offering better readability of web pages on the CLI"; + homepage = "https://github.com/mrusme/reader"; + changelog = "https://github.com/mrusme/reader/releases"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "reader"; + }; + }; +in +self diff --git a/third_party/nixpkgs/pkgs/by-name/re/reco/package.nix b/third_party/nixpkgs/pkgs/by-name/re/reco/package.nix new file mode 100644 index 0000000000..27742087dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/reco/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook4, + libgee, + live-chart, + ryokucha, + pantheon, + gst_all_1, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "reco"; + version = "5.0.2"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "reco"; + rev = finalAttrs.version; + hash = "sha256-uZAcZJLQH0MTI4NSJnZvzYPBFVXGBqAhsjVLAVP/ZwI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + libgee + live-chart + ryokucha + pantheon.granite7 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-libav + ]; + + mesonFlags = [ (lib.mesonBool "use_submodule" false) ]; + + meta = { + description = "Audio recorder focused on being concise and simple to use"; + homepage = "https://github.com/ryonakano/reco"; + license = lib.licenses.gpl3Plus; + mainProgram = "com.github.ryonakano.reco"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix b/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix index d176accf9d..87e43d32bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix @@ -7,20 +7,22 @@ , perl , openssl }: + rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.79"; + version = "0.3.98"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-tI9/FtGxjKPIFg6L7pNeSx24G3FcfwOlIqcuF6wCTSU="; + hash = "sha256-DSEtku9Xyp8MRibO8VPeRlc9CnPupAqQRFXMJD2yNA8="; }; - cargoHash = "sha256-UN3SkNNY8ovaT/eNb9JyF9KQWt8KG0TX9ztLjrAnPPo="; + cargoHash = "sha256-66P9ShtMZM5XcH8Q9ifw92VCDcwKPhZOywj3Acbhf9o="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; + buildInputs = [ openssl ]; buildAndTestSubdir = "crates/release_plz"; @@ -38,6 +40,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Publish Rust crates from CI with a Release PR"; homepage = "https://release-plz.ieni.dev"; + changelog = "https://github.com/MarcoIeni/release-plz/blob/release-plz-v${version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ dannixon ]; mainProgram = "release-plz"; diff --git a/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix index 1bf1df34ba..bbeadc7773 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix @@ -15,11 +15,11 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.00.06"; + version = "05.00.07"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - hash = "sha256-uGGh1eRPT6bGYF4F9e79D+aMnpOQukktlmJbyM2uRco="; + hash = "sha256-id3yVyKHRSJWhm8r4Zmc/k61AZUt1wa3lArQktDbt9w="; }; propagatedBuildInputs = lib.optionals withGui [ @@ -31,7 +31,7 @@ tcl.mkTclDerivation rec { # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use # as rem2pdf is currently not build since it requires the JSON::MaybeXS, # Pango and Cairo Perl modules. - substituteInPlace scripts/tkremind \ + substituteInPlace scripts/tkremind.in \ --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \ --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \ --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \ diff --git a/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix index 6f20acf9d0..2d47c1e879 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix @@ -43,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-zTbwivYqNeArgwA6tePe2vExKoT/iLV3TS5ag8PlRgQ="; + hash = "sha256-AdNleEe1wVBfhhoM6xit06ql1xEz/TLhZ7qpofwQ874="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/third_party/nixpkgs/pkgs/by-name/re/renpy/5687.patch b/third_party/nixpkgs/pkgs/by-name/re/renpy/5687.patch new file mode 100644 index 0000000000..0ed4a88391 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/renpy/5687.patch @@ -0,0 +1,91 @@ +From b120f82f9809b98231188daacb94f22a9e69187a Mon Sep 17 00:00:00 2001 +From: Gregor Riepl +Date: Thu, 8 Aug 2024 23:56:16 +0200 +Subject: [PATCH] Replace deprecated APIs when compiling against newer FFmpeg + +--- + module/ffmedia.c | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +diff --git a/module/ffmedia.c b/module/ffmedia.c +index d4bb346ac35740711b8393e66d0bfc28c849ff0e..0f57e311f277359fad731e348531becbadbb06d4 100644 +--- a/module/ffmedia.c ++++ b/module/ffmedia.c +@@ -71,7 +71,11 @@ static int rwops_read(void *opaque, uint8_t *buf, int buf_size) { + + } + ++#if (LIBAVFORMAT_VERSION_MAJOR < 61) + static int rwops_write(void *opaque, uint8_t *buf, int buf_size) { ++#else ++static int rwops_write(void *opaque, const uint8_t *buf, int buf_size) { ++#endif + printf("Writing to an SDL_rwops is a really bad idea.\n"); + return -1; + } +@@ -690,9 +694,14 @@ static void decode_audio(MediaState *ms) { + } + + converted_frame->sample_rate = audio_sample_rate; ++#if (LIBAVUTIL_VERSION_MAJOR < 59) + converted_frame->channel_layout = AV_CH_LAYOUT_STEREO; ++#else ++ converted_frame->ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO; ++#endif + converted_frame->format = AV_SAMPLE_FMT_S16; + ++#if (LIBAVUTIL_VERSION_MAJOR < 59) + if (!ms->audio_decode_frame->channel_layout) { + ms->audio_decode_frame->channel_layout = av_get_default_channel_layout(ms->audio_decode_frame->channels); + +@@ -711,6 +720,26 @@ static void decode_audio(MediaState *ms) { + swr_set_matrix(ms->swr, stereo_matrix, 1); + } + } ++#else ++ if (ms->audio_decode_frame->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { ++ av_channel_layout_default(&ms->audio_decode_frame->ch_layout, ms->audio_decode_frame->ch_layout.nb_channels); ++ ++ if (audio_equal_mono && (ms->audio_decode_frame->ch_layout.nb_channels == 1)) { ++ swr_alloc_set_opts2( ++ &ms->swr, ++ &converted_frame->ch_layout, ++ converted_frame->format, ++ converted_frame->sample_rate, ++ &ms->audio_decode_frame->ch_layout, ++ ms->audio_decode_frame->format, ++ ms->audio_decode_frame->sample_rate, ++ 0, ++ NULL); ++ ++ swr_set_matrix(ms->swr, stereo_matrix, 1); ++ } ++ } ++#endif + + if(swr_convert_frame(ms->swr, converted_frame, ms->audio_decode_frame)) { + av_frame_free(&converted_frame); +@@ -1159,7 +1188,11 @@ static int decode_thread(void *arg) { + + // Compute the number of samples we need to play back. + if (ms->audio_duration < 0) { ++#if (LIBAVFORMAT_VERSION_MAJOR < 62) + if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) { ++#else ++ if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) { ++#endif + + long long duration = ((long long) ctx->duration) * audio_sample_rate; + ms->audio_duration = (unsigned int) (duration / AV_TIME_BASE); +@@ -1319,7 +1352,11 @@ static int decode_sync_start(void *arg) { + + // Compute the number of samples we need to play back. + if (ms->audio_duration < 0) { ++#if (LIBAVFORMAT_VERSION_MAJOR < 62) + if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) { ++#else ++ if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) { ++#endif + + long long duration = ((long long) ctx->duration) * audio_sample_rate; + ms->audio_duration = (unsigned int) (duration / AV_TIME_BASE); diff --git a/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix index 5cc7a09705..9bba63ce1c 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, python311, pkg-config, SDL2, @@ -86,7 +87,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - patches = [ ./shutup-erofs-errors.patch ]; + patches = [ + ./shutup-erofs-errors.patch + ./5687.patch + ]; postPatch = '' cp tutorial/game/tutorial_director.rpy{m,} diff --git a/third_party/nixpkgs/pkgs/by-name/ri/river-bsp-layout/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/river-bsp-layout/package.nix new file mode 100644 index 0000000000..a5c64c60fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ri/river-bsp-layout/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "river-bsp-layout"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "areif-dev"; + repo = "river-bsp-layout"; + rev = "v${version}"; + hash = "sha256-LRVZPAS4V5PtrqyOkKUfrZuwLqPZbLoyjn2DPxCFE2o="; + }; + + cargoHash = "sha256-CtVyRwfIS8R48LUecKXoak+HHB5yNZ5RgguIWOhyFA8="; + + meta = { + homepage = "https://github.com/areif-dev/river-bsp-layout"; + description = "Binary space partition / grid layout manager for River WM"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ areif-dev ]; + mainProgram = "river-bsp-layout"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rospo/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rospo/package.nix index 088d0d04f6..19300832ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/rospo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/rospo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rospo"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ferama"; repo = "rospo"; rev = "v${version}"; - hash = "sha256-cUah73wr0fKK9Lw3228r5SITDn5rNlpgQW5rHtbo6jU="; + hash = "sha256-+1xrke8dfMkuZZ/imY+1KkeJnZCDtKJpxwAg5ksErnM="; }; - vendorHash = "sha256-KbR8T7KwueQ9fc4AOX26GOTQFXuV9LgfSxgwCzQt4eE="; + vendorHash = "sha256-MTPFBrLFMQ2hEwtSDb7t3ls/Wagw7s9/w6bwWjZ62vE="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix index 469d3531e5..147c0bbb68 100644 --- a/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-+tlBJGJTkxjsXS0zj6rsn2j4FIQNh70gj8pVdOa3mlU="; + hash = "sha256-mAAo4SdJ8cj8aqnbm+azcnxq8lFBvOy3BlSEKz9MA0Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ru/russ/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/russ/package.nix new file mode 100644 index 0000000000..98d460b6d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ru/russ/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: + +rustPlatform.buildRustPackage { + pname = "russ"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "ckampfe"; + repo = "russ"; + rev = "b21aa80ebc9dc2668463386f9eb270b1782d5842"; + hash = "sha256-/76CvSBYim831OZzLhsj2Hm+0hoY/FLtKQqt19E5YOI="; + }; + + cargoHash = "sha256-d3lJQafvBuj9Sb2Tuep3Ypt1sP+vlWHk4kuP99gMly8="; + + # tests are network based :( + doCheck = false; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + AppKit + ] + ); + + meta = { + changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; + description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; + homepage = "https://github.com/ckampfe/russ"; + license = with lib.licenses; [ agpl3Only ]; + maintainers = with lib.maintainers; [ blusk ]; + mainProgram = "russ"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix index 07d8ddd6da..9dc2238231 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-hkkylXJOhPOC4p+MOuYCzfcmCoHmm+/8afsaPFwD1/s="; + hash = "sha256-5Zr3ZxKUT8S8vfHNaCResF+S2UcHrk5pGwJH4riTzIw="; }; - cargoHash = "sha256-Rh96vPLAxz8KCIk9y9TFB2fP0JngnM9LSsClWfgYUG0="; + cargoHash = "sha256-HOpBBXJk8bHjXfRq8UczfMjr3bM91lB62taTlUGUC+M="; nativeBuildInputs = [ installShellFiles ]; @@ -49,6 +49,9 @@ rustPlatform.buildRustPackage rec { lib.licenses.mit lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.nobbz ]; + maintainers = [ + lib.maintainers.nobbz + lib.maintainers.pmw + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock index 615c6cb0f0..d2a1fc0559 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.41.0" +version = "0.42.0" dependencies = [ "age", "anyhow", diff --git a/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix b/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix index e851728233..529342dbe5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix @@ -12,21 +12,21 @@ stdenv, darwin, + versionCheckHook, + # passthru nix-update-script, - testers, - rye, }: rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-JpCa+7SwShfVM4Z+uPo7W2bCEf1QYHxClE/LgGSyFY0="; + hash = "sha256-f+yVuyoer0bn38iYR94TUKRT5VzQHDZQyowtas+QOK0="; }; cargoLock = { @@ -99,9 +99,14 @@ rustPlatform.buildRustPackage rec { "--skip=test_version" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = rye; }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ry/ryokucha/package.nix b/third_party/nixpkgs/pkgs/by-name/ry/ryokucha/package.nix new file mode 100644 index 0000000000..35ab71b011 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ry/ryokucha/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + gtk4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ryokucha"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "ryokucha"; + rev = finalAttrs.version; + hash = "sha256-bmN8ZiFjUXtWMrZz7BJtO/9TMjcc4d3x8EpFvhvsewY="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ gtk4 ]; + + strictDeps = true; + + meta = { + description = "GTK4 library that includes customized widgets"; + homepage = "https://github.com/ryonakano/ryokucha"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix index 5fa852a6d1..3b6c2e372a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.21"; + version = "1.0.22"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-zoTZ0JwkV6zaKHw1PegzE6NiGGVptBZgCgD8O9ZHHGc="; + hash = "sha256-356T39GotzLj4lu5KYulpFn2RmS7fZOgjz6Yy9M2T6Y="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/se/seq-cli/deps.nix b/third_party/nixpkgs/pkgs/by-name/se/seq-cli/deps.nix new file mode 100644 index 0000000000..d99b2edc3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/seq-cli/deps.nix @@ -0,0 +1,23 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Autofac"; version = "8.1.1"; hash = "sha256-///N/c/OmCa7DUVz9/hIA/rFsaJ4TMltqdrVk7Ycmq8="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Seq.Api"; version = "2024.3.0"; hash = "sha256-OUBZ9VV7C5p/CzW0hoN3N9m1RAEGg24wNYFZgfJgk4s="; }) + (fetchNuGet { pname = "Seq.Apps"; version = "2023.4.0"; hash = "sha256-PLN0KYbxH9aQkMCTOSmb16NcGD+XDooJdU4QIej1i+0="; }) + (fetchNuGet { pname = "Seq.Syntax"; version = "1.0.0"; hash = "sha256-FcDdFhRE2EIgQjoTHDjKLq/Pl9mKzezL/B75pGhvk9s="; }) + (fetchNuGet { pname = "Serilog"; version = "4.0.2"; hash = "sha256-vkd4s/PsKnnVzN1+f9haIP5LoxNWxnhdv3mBQYl/2Hc="; }) + (fetchNuGet { pname = "Serilog.Expressions"; version = "5.0.0"; hash = "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E="; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "3.0.0"; hash = "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY="; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact.Reader"; version = "4.0.0"; hash = "sha256-89+SaaXp9Pt8YTkTwVuMV3PzlPMg9mOHiFBKs3oHOUs="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.Seq"; version = "8.0.0"; hash = "sha256-1AEtDLODwS9WBkJ2yrmjKl2Rq3q2VPs1H9bQCUhC05s="; }) + (fetchNuGet { pname = "SerilogTracing"; version = "2.1.2"; hash = "sha256-fhSiUgk21s7kiz4QYF2fy9YLC1X0YHibi95x2flPqMM="; }) + (fetchNuGet { pname = "Superpower"; version = "3.0.0"; hash = "sha256-5MNmhBDYyOs+sTH364Qdn+Ck328BAQaVC1KMQ7yK2Vw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.1"; hash = "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) + (fetchNuGet { pname = "Tavis.UriTemplates"; version = "2.0.0"; hash = "sha256-Rd3VH55GFiXhMDbUcnKri2jDVIA1M7CQ+6Fjdsn/PSE="; }) +] diff --git a/third_party/nixpkgs/pkgs/by-name/se/seq-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/se/seq-cli/package.nix new file mode 100644 index 0000000000..bec066fcce --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/seq-cli/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + testers, +}: + +buildDotnetModule (finalAttrs: { + pname = "seq-cli"; + version = "2024.3.922"; + + src = fetchFromGitHub { + owner = "datalust"; + repo = "seqcli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-qqvuxG/QkkYjYw+p5QxLBWYHyltKDWT3JT167bEAdEI="; + }; + + projectFile = "src/SeqCli/SeqCli.csproj"; + nugetDeps = ./deps.nix; + dotnetInstallFlags = "-f net8.0"; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + executables = [ "seqcli" ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "seqcli version"; + }; + + meta = { + description = "The Seq command-line client. Administer, log, ingest, search, from any OS"; + homepage = "https://github.com/datalust/seqcli"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hausken ]; + mainProgram = "seqcli"; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shanggu-fonts/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shanggu-fonts/package.nix index 1702dddba5..96d366dedf 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/shanggu-fonts/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/shanggu-fonts/package.nix @@ -23,12 +23,14 @@ let Sans = "sha256-x5z6GYsfQ+8a8W0djJTY8iutuLNYvaemIpdYh94krk0="; Serif = "sha256-3WK7vty3zZFNKkwViEsozU3qa+5hymYwXk6ta9AxmNM="; }; + + extraOutputs = builtins.attrNames source; in stdenvNoCC.mkDerivation { pname = "shanggu-fonts"; inherit version; - outputs = [ "out" ] ++ builtins.attrNames source; + outputs = [ "out" ] ++ extraOutputs; nativeBuildInputs = [ p7zip ]; @@ -49,13 +51,10 @@ stdenvNoCC.mkDerivation { mkdir -p $out/share/fonts/truetype '' + lib.strings.concatLines ( - lib.lists.forEach (builtins.attrNames source) ( - name: ('' - install -Dm444 ${name}/*.ttc -t $'' + name + ''/share/fonts/truetype - ln -s $'' + name + ''/share/fonts/truetype/*.ttc $out/share/fonts/truetype - '' - ) - ) + lib.lists.forEach extraOutputs (name: '' + install -Dm444 ${name}/*.ttc -t ${placeholder name}/share/fonts/truetype + ln -s "${placeholder name}" /share/fonts/truetype/*.ttc $out/share/fonts/truetype + '') ) + '' runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shpool/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shpool/package.nix index 2cb4489cff..3f252a8008 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/shpool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "shpool"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; - hash = "sha256-0ykGGzYL29SxxT0etTaBHooIE8NEUJeTIr/6vTBgY0Q="; + hash = "sha256-pSSMC4pUtB38c6UNOj+Ma/Y1jcSfm33QV1B4tA/MyKY="; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-cuLscDki8Y68qtEZh7xDaLp5B6MyTkPWTQX5gHNtULQ="; + cargoHash = "sha256-NUo9Y/c4Wm3d8lbhdHEqu9Zp7tX8giq2wnYwz8SMTXo="; buildInputs = [ linux-pam diff --git a/third_party/nixpkgs/pkgs/by-name/si/simpleini/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simpleini/package.nix new file mode 100644 index 0000000000..64f330fbdc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/simpleini/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "simpleini"; + version = "4.22"; + + src = fetchFromGitHub { + name = "simpleini-sources-${finalAttrs.version}"; + owner = "brofield"; + repo = "simpleini"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-H4J4+v/3A8ZTOp4iMeiZ0OClu68oP4vUZ8YOFZbllcM="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gtest + ]; + + strictDeps = true; + + cmakeFlags = [ (lib.cmakeBool "SIMPLEINI_USE_SYSTEM_GTEST" true) ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform C++ library providing a simple API to read and write INI-style configuration files"; + longDescription = '' + A cross-platform library that provides a simple API to read and write + INI-style configuration files. It supports data files in ASCII, MBCS and + Unicode. It is designed explicitly to be portable to any platform and has + been tested on Windows, WinCE and Linux. Released as open-source and free + using the MIT licence. + ''; + homepage = "https://github.com/brofield/simpleini"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + HeitorAugustoLN + AndersonTorres + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/si/sioyek/package.nix b/third_party/nixpkgs/pkgs/by-name/si/sioyek/package.nix index 954e7ef197..dc4be19cfd 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/sioyek/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/sioyek/package.nix @@ -24,17 +24,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MOqWitXnYn8efk2LSeAOhmpcxGn6hbvjXbNTXEDdxIM="; }; - buildInputs = [ - gumbo - harfbuzz - jbig2dec - mujs - mupdf - openjpeg - qt6.qt3d - qt6.qtbase - qt6.qtspeech - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; + buildInputs = + [ + gumbo + harfbuzz + jbig2dec + mujs + mupdf + openjpeg + qt6.qt3d + qt6.qtbase + qt6.qtspeech + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix index 888707fcf6..5d889a6c4e 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-g6O6YE1irE3Hy+Xu7MeH97Oc4bq32IDnfP1VLSiF/U4="; + hash = "sha256-ZaurLQlM81lCGdMwvl/1YDzpC/mU08Wlgx4/MAm6un4="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix index 0a5ff82c90..1433390931 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-u0Rr086p6gotS+p9365+P8uKEqxDNGnWCsZDCaj8eEE="; + hash = "sha256-gS1/n4UimdPi79/a1itsh172YtBr2jvRSu+u2C4NZ70="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix index 1d818d11ae..f0d6784bf8 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix @@ -42,8 +42,8 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.129.0.202"; - revision = "365"; + version = "8.130.0.205"; + revision = "368"; rpath = lib.makeLibraryPath [ @@ -103,7 +103,7 @@ let fetchurl { name = "skypeforlinux-${version}-${revision}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-pxLh/dU/RK1H5gjFLB0V4mVddgQkO8ZcJowpNNihECsLaELgoeXmWXflhYFs2G7fdEzNMeujuc4/ZoGCFSZCvw=="; + hash = "sha512-eDSJQndUDxSsRg9bSevWUih1iXDp3n1kU0RdRAu3GsHeRC/JJx3m4vKxP0F/Rcf2Toxd3MPG2r6Oa1Wa7upcGg=="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snipaste/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snipaste/package.nix index 45b35d04d6..12cf92be8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snipaste/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snipaste/package.nix @@ -5,18 +5,23 @@ }: appimageTools.wrapType2 rec { pname = "snipaste"; - version = "2.9.2-Beta"; + version = "2.10.2"; src = fetchurl { url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage"; - hash = "sha256-oV69uABjzkbQdwb+1wRRxszhrwI4uyzhQZ4aXBnyeo8="; + hash = "sha256-u9e2d9ZpHDbDIsFkseOdJX2Kspn9TkhFfZxbeielDA8="; }; + passthru.updateScript = ./update.sh; + meta = { description = "Screenshot tools"; homepage = "https://www.snipaste.com/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + ltrump + ]; mainProgram = "snipaste"; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snipaste/update.sh b/third_party/nixpkgs/pkgs/by-name/sn/snipaste/update.sh new file mode 100755 index 0000000000..1c6843fe68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sn/snipaste/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts + +latestTag=$(curl -sSfL https://www.snipaste.com/linux_version | jq -r ".subject") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; snipaste.version" | tr -d '"') + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +prefetch=$(nix-prefetch-url "https://download.snipaste.com/archives/Snipaste-$latestVersion-x86_64.AppImage") +hash=$(nix-hash --type sha256 --to-sri "$prefetch") +update-source-version snipaste "$latestVersion" "$hash" --ignore-same-version diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix new file mode 100644 index 0000000000..3736427ef9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix @@ -0,0 +1,74 @@ +{ + stdenv, + lib, + fetchFromGitLab, + python3, + meson, + ninja, + cmake, + vala, + gettext, + desktop-file-utils, + appstream-glib, + glib, + pkg-config, + libadwaita, + nix-update-script, + gtksourceview5, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "snoop"; + version = "0.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "philippun1"; + repo = "snoop"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-JrSUGxhlr4wCGoh589AkPRhNmfsi7msv9EO2k1pHlKY="; + }; + + patchPhase = '' + runHook prePatch + + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail "/usr/bin/env python3" "${lib.getExe python3}" + + sed -i '/gtk-update-icon-cache/d' build-aux/meson/postinstall.py + sed -i '/update-desktop-database/d' build-aux/meson/postinstall.py + + runHook postPatch + ''; + + nativeBuildInputs = [ + meson + ninja + cmake + gettext + vala + desktop-file-utils + appstream-glib + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + libadwaita + gtksourceview5 + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://gitlab.gnome.org/philippun1/snoop"; + changelog = "https://gitlab.gnome.org/philippun1/snoop/-/releases/${finalAttrs.version}"; + description = "Search through file contents in a given folder"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.gpl3Plus; + mainProgram = "snoop"; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spacectl/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacectl/package.nix index 7fe0fc2bbf..2684a7708f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spacectl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spacectl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "spacectl"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${version}"; - hash = "sha256-wEu7AmFn1782XTKKb7JxQWn/ZSHrQbuZ/SDldn6pUNo="; + hash = "sha256-pO+jYuCyP6YrU9vE3//O0EyTDXYQ1WSpFI/8WbneDCA="; }; vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo="; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/speakersafetyd/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/speakersafetyd/package.nix index 550b8af9a5..9cac13c15b 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/speakersafetyd/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "speakersafetyd"; - version = "1.0.0"; + version = "1.0.2"; src = fetchCrate { inherit pname version; - hash = "sha256-I1RTtD5V4Z8R8zed/b4FitHyE7gFAja5YcA+z0VvSX0="; + hash = "sha256-3DzBNebg1y/+psD2zOpDsnRJmabQLeO1UMxPq9M0CsU="; }; - cargoHash = "sha256-8Dmts6SCRrZqyI+pdfgqsXfJy9Hqspbdb6EpQChMKDA="; + cargoHash = "sha256-InWaPybZbUbhIF1MEMeTUGa8LRUPwcTdw7uclZ1zBu4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix index dff8f754b3..2d251ea39e 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix @@ -1,24 +1,28 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "spirit"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cashapp"; repo = "spirit"; rev = "v${version}-prerelease"; - hash = "sha256-e0Eu7BeOwZA8UKwonuuOde1idzaIMtprWya7nxgqyjs="; + hash = "sha256-mI4nO/yQdCrqxCDyOYQPQ905EVreYPEiupe+F4RjIqw="; }; vendorHash = "sha256-es1PGgLoE3DklnQziRjWmY7f6NNVd24L2JiuLkol6HI="; subPackages = [ "cmd/spirit" ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { homepage = "https://github.com/cashapp/spirit"; diff --git a/third_party/nixpkgs/pkgs/by-name/sr/srgn/package.nix b/third_party/nixpkgs/pkgs/by-name/sr/srgn/package.nix index cb1e0fc66b..9e39aa27b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/sr/srgn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sr/srgn/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-yVjxNTftrtKb/KHRZG7E3JcsCEtixhfBiHl/6zdcLMo="; + hash = "sha256-JjO4ZH4CYu2qwYfUrwTASYuxyBjObLb9ydPPbObew0g="; }; - cargoHash = "sha256-Z8y5gN4CzfllUzSMUyCc7TZKeIYVZtATnaIQIga5cAk="; + cargoHash = "sha256-/Y85FbmHfape2K8tdu/amjW8Q5Eg19HOPCE/x8qZ8uY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ss/sscep/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/sscep/package.nix new file mode 100644 index 0000000000..52e97fe18f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ss/sscep/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + openssl, + autoreconfHook, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sscep"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "certnanny"; + repo = "sscep"; + rev = "v${finalAttrs.version}"; + hash = "sha256-wlxQONOCLPuNdI6AyMJoLP09cs+ak7Jv9idhXTT5RWA="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Client-only implementation of the SCEP (Cisco System's Simple Certificate Enrollment Protocol)"; + homepage = "https://github.com/certnanny/sscep"; + maintainers = [ lib.maintainers.stv0g ]; + license = [ + lib.licenses.bsd2 + lib.licenses.openssl + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-tpm-agent/package.nix index 416429cb26..ecffd87e94 100644 --- a/third_party/nixpkgs/pkgs/by-name/ss/ssh-tpm-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ss/ssh-tpm-agent/package.nix @@ -1,28 +1,31 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script , openssl }: buildGoModule rec { pname = "ssh-tpm-agent"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Foxboron"; repo = "ssh-tpm-agent"; rev = "v${version}"; - hash = "sha256-gO9qVAVCvaiLrC/GiTJ0NghiXVRXXRBlvOIVSAOftR8="; + hash = "sha256-yK7G+wZIn+kJazKOFOs8EYlRWZkCQuT0qZfmdqbcOnM="; }; proxyVendor = true; - vendorHash = "sha256-Upq8u5Ip0HQW5FGyqhVUT6rINXz2BpCE7lbtk9fPaWs="; + vendorHash = "sha256-njKyBfTG/QCPBBsj3Aom42cv2XqLv4YeS4DhwNQNaLA="; buildInputs = [ openssl ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "SSH agent with support for TPM sealed keys for public key authentication"; homepage = "https://github.com/Foxboron/ssh-tpm-agent"; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stackql/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stackql/package.nix index fb0b02d559..b670497d4a 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stackql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.742"; + version = "0.5.748"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-GMc22n0y4lKv4DlG9069p/TrMJLyw0Zdiykuo41Tgys="; + hash = "sha256-3nt0hGBbS99WCRs3WnaB+0T/DS/uWROigYhXJw0fms8="; }; - vendorHash = "sha256-dssGqcS9l3VipEypKErlCeRs087Tb5Kx4VXvkErZar4="; + vendorHash = "sha256-oIpkhZHqg02qs68/ljuhNkw0BiIkY++du/pJRHXlPs0="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix index bb8a085923..28a2d452c9 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix @@ -25,7 +25,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.10.3"; + version = "0.10.5"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-xpNSMZWWiFU6OOooAD7ENzOggqYHdU88baPsXnovpXU="; + hash = "sha256-MD9zAWeitP3cXxzR4znqL551AGFbOcRzhV3goY6l/iY="; fetchSubmodules = true; }; - cargoHash = "sha256-qiKfHrxQ4TSSomDLlPJ2+GOEri/ZuMCvUNdxRVoplgg="; + cargoHash = "sha256-ug49H6RWLlDdJNVW/BJcqNsG/NDNgWiqR8GiZ/HVrvY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix index 18fb6de2b0..7ece59b98f 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix @@ -6,7 +6,7 @@ installShellFiles, }: let - version = "0.27.4"; + version = "0.27.5"; in buildGoModule { pname = "step-cli"; @@ -16,7 +16,7 @@ buildGoModule { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-dMqJZ8UWJ6umJZAkcvSYQNh8e8ktPeqw1QHYagE2CvA="; + hash = "sha256-5WtXJOyVUkjuJdUJ2Q4wAVDMLQ0lZI6461bZVR26h1A="; }; ldflags = [ @@ -30,7 +30,7 @@ buildGoModule { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-t4L+nw2KJ+79drVRJseNjzO4/qczeOL2dmcd2mlXFVQ="; + vendorHash = "sha256-7N+0sp1/vl2VWZWT4R6XMiji7g/qPz68JMnZaNIUl+Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stern/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stern/package.nix new file mode 100644 index 0000000000..b12003f800 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/stern/package.nix @@ -0,0 +1,61 @@ +{ + buildGoModule, + buildPackages, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, + stern, + testers, +}: + +buildGoModule rec { + pname = "stern"; + version = "1.31.0"; + + src = fetchFromGitHub { + owner = "stern"; + repo = "stern"; + rev = "v${version}"; + hash = "sha256-1jwjd9enO2rQnC+04brzfJKSutnkWLMPyZD0wAqHBfg="; + }; + + vendorHash = "sha256-IBOkx+y7EFQeQ0sumXiVRqKqHts4SOxB138Uz644cnc="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/stern/stern/cmd.version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + let + stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern; + in + '' + for shell in bash zsh fish; do + ${stern}/bin/stern --completion $shell > stern.$shell + installShellCompletion stern.$shell + done + ''; + + passthru.tests.version = testers.testVersion { + package = stern; + }; + + meta = { + description = "Multi pod and container log tailing for Kubernetes"; + changelog = "https://github.com/stern/stern/releases/tag/v${version}"; + homepage = "https://github.com/stern/stern"; + license = lib.licenses.asl20; + mainProgram = "stern"; + maintainers = with lib.maintainers; [ + mbode + preisschild + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix b/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix index bc7be6543e..b276581f38 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sttr"; - version = "0.2.23"; + version = "0.2.24"; src = fetchFromGitHub { owner = "abhimanyu003"; repo = "sttr"; rev = "v${version}"; - hash = "sha256-BO6R41FtpPS3GBuKifm+gEnkkQodQDtbjZWtsGtuvms="; + hash = "sha256-9p4h30iM3SZDCAn08KQjJLJGbQND13gbWK5rhW+Knok="; }; - vendorHash = "sha256-n+B/e3M+S46vATq9eVXiYcO2s5WNGSvSE2Ci2rpigog="; + vendorHash = "sha256-GJtnwnT+dJAjnAlGcoealsiKcLu0bBBHOE8xRjJQaVs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix index 2bf7195d83..1cd0340220 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix @@ -1,5 +1,4 @@ { - bash, fetchFromGitHub, lib, nodejs, @@ -18,14 +17,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-mzhY6MKkXb1jFYZvs/VkGipBjBfUY3GukICb9qVQI80="; }; - nativeBuildInputs = [ + buildInputs = [ nodejs + ]; + + nativeBuildInputs = [ pnpm_9.configHook ]; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-/QJ4buPOt5KFJxwsQp7L9WYE1RtODj4LMq21l99QwhA="; + hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE="; }; buildPhase = '' @@ -41,11 +43,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/${finalAttrs.pname}} mv {dist,node_modules} $out/lib/${finalAttrs.pname} - echo " - #!${lib.getExe bash} - ${lib.getExe nodejs} $out/lib/${finalAttrs.pname}/dist/index.js \$@ - " > $out/bin/stylelint-lsp - chmod +x $out/bin/stylelint-lsp + chmod a+x $out/lib/${finalAttrs.pname}/dist/index.js + ln -s $out/lib/${finalAttrs.pname}/dist/index.js $out/bin/stylelint-lsp runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix b/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix index 849294960b..82d872ea1f 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8="; + hash = "sha256-Y14wBYiAsctMf4Ljt7G/twGEQP2nCSDQZVG8otImnIE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svdtools/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svdtools/package.nix index b8eb3c6096..e5b37a527a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svdtools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sv/svdtools/package.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.18"; + version = "0.3.19"; src = fetchCrate { inherit version pname; - hash = "sha256-Pf5OCeIbrVtwEeo6x2xpPpbbAEnHuScC0pUb0NLdtfg="; + hash = "sha256-5s4CPV6Tke37QlyMzI6WFDb9EdRfcFDoFrmuWblbp20="; }; - cargoHash = "sha256-nQWxhfupbAE4W4hCn4KOP8MEoTfia+BfgA1QQsV9YyI="; + cargoHash = "sha256-VrOFu7LNFeH70VPdz9uJxXuRtTvxKiS1dlhCdr++7+g="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock index 4363c3ef35..02b7c88022 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock @@ -2100,6 +2100,23 @@ dependencies = [ "tower-layer", ] +[[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +dependencies = [ + "bytes", + "futures", + "headers", + "http 0.2.12", + "hyper 0.14.28", + "openssl", + "tokio", + "tokio-openssl", + "tower-service", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -4830,7 +4847,7 @@ dependencies = [ [[package]] name = "svix-server" -version = "1.30.0" +version = "1.38.0" dependencies = [ "aide", "anyhow", @@ -4857,6 +4874,7 @@ dependencies = [ "http 0.2.12", "hyper 0.14.28", "hyper-openssl", + "hyper-proxy", "hyper-socks2", "indexmap 1.9.3", "ipnet", diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix index 6552147449..6b9dfe2f13 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "svix-server"; - version = "1.30.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${version}"; - hash = "sha256-W5oLN0rMG2c8h05sIEOf4h95SQrFrs/7vLpsHH91sIA="; + hash = "sha256-gi6Jm0tf1lP10UYpouCleN32K71upYOudxjOoRgsGLg="; }; sourceRoot = "${src.name}/server"; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix index b05395fc4c..3a347ce958 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, wayland-scanner -, wayland -, wayland-protocols -, json_c -, libxkbcommon -, fontconfig -, giflib -, libheif -, libjpeg -, libwebp -, libtiff -, librsvg -, libpng -, libjxl -, libexif -, libavif -, openexr_3 -, bash-completion -, testers +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wayland-scanner, + wayland, + wayland-protocols, + json_c, + libxkbcommon, + fontconfig, + giflib, + libheif, + libjpeg, + libwebp, + libtiff, + librsvg, + libpng, + libjxl, + libexif, + libavif, + openexr_3, + bash-completion, + testers, }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.2"; + version = "3.4"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; rev = "v${finalAttrs.version}"; - hash = "sha256-Eqs8U2BpjcweDi4oGS9nWpoyoXeuiD+6jviPA3s9/YY="; + hash = "sha256-bUU4s7nlN48rYMX4SleUDAOCVz2fowGctEfP6KhMdoA="; }; strictDeps = true; @@ -41,7 +42,12 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + ]; mesonFlags = [ (lib.mesonOption "version" finalAttrs.version) diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swt/awt-libs.patch b/third_party/nixpkgs/pkgs/by-name/sw/swt/awt-libs.patch deleted file mode 100644 index 6c3ff53b79..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/sw/swt/awt-libs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/make_linux.mak -+++ b/make_linux.mak -@@ -63,4 +63,4 @@ - - AWT_LFLAGS = -shared ${SWT_LFLAGS} --AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -+AWT_LIBS = `pkg-config --libs x11` -L$(AWT_LIB_PATH) -ljawt - diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swt/gtk-libs.patch b/third_party/nixpkgs/pkgs/by-name/sw/swt/gtk-libs.patch deleted file mode 100644 index cd13082b5d..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/sw/swt/gtk-libs.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/make_linux.mak -+++ b/make_linux.mak -@@ -53,9 +53,4 @@ - --# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) --GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)` -+GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst` -+GTKLIBS = `pkg-config --libs gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst` --ifeq ($(GTK_VERSION), 3.0) --GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 -lXtst --else --GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst --endif - diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swt/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swt/package.nix index 7f386779d4..b06eaa9ab0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swt/package.nix @@ -1,13 +1,9 @@ { - atk, fetchzip, - gtk2, + gtk3, jdk, lib, - libGL, libGLU, - libXt, - libXtst, pkg-config, stdenv, stripJavaArchivesHook, @@ -15,18 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "swt"; - version = "4.5"; - fullVersion = "${finalAttrs.version}-201506032000"; + version = "4.33"; + fullVersion = "${finalAttrs.version}-202409030240"; hardeningDisable = [ "format" ]; passthru.srcMetadataByPlatform = { x86_64-linux.platform = "gtk-linux-x86_64"; - x86_64-linux.hash = "sha256-JhzRCrVzsM2NBf65l6CDZdgchlbECHGUg0J0bQVT2Z0="; - i686-linux.platform = "gtk-linux-x86"; - i686-linux.hash = "sha256-C7H1CUFkl7GPpqDFSzYnlLWa1XcawI2hbtsn9fIJio0="; + x86_64-linux.hash = "sha256-0OUr+jpwTx5/eoA6Uo2E9/SBAtf+IMMiSVRhOfaWFhE="; x86_64-darwin.platform = "cocoa-macosx-x86_64"; - x86_64-darwin.hash = "sha256-CrSFkrlnSP2uQzRrRzv8F0lXEA7TNK9RFe2neDjtXnI="; + x86_64-darwin.hash = "sha256-n948C/YPF55WPYvub3re/wARLP1Wk+XhJiIuI0YQH5c="; }; passthru.srcMetadata = finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null; @@ -56,84 +50,41 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + jdk stripJavaArchivesHook pkg-config ]; buildInputs = [ - atk - gtk2 - jdk - libGL + gtk3 libGLU - libXtst - ] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [ libXt ]; - - patches = [ - ./awt-libs.patch - ./gtk-libs.patch ]; - prePatch = '' - # clear whitespace from makefiles (since we match on EOL later) - sed -i 's/ \+$//' ./*.mak + SWT_JAVA_HOME = jdk; + AWT_LIB_PATH = "${jdk}/lib/openjdk/lib"; + # Used by the makefile which is responsible for the shared objects only + OUTPUT_DIR = "${placeholder "out"}/lib"; + # GTK4 is not supported yet. Waiting for: + # https://github.com/eclipse-platform/eclipse.platform.swt/pull/1482 + makeFlags = "gtk3"; + preBuild = '' + cd library + mkdir -p ${finalAttrs.OUTPUT_DIR} ''; - postPatch = - let - makefile-sed = builtins.toFile "swt-makefile.sed" '' - # fix pkg-config invocations in CFLAGS/LIBS pairs. - # - # change: - # FOOCFLAGS = `pkg-config --cflags `foo bar` - # FOOLIBS = `pkg-config --libs-only-L foo` -lbaz - # into: - # FOOCFLAGS = `pkg-config --cflags foo bar` - # FOOLIBS = `pkg-config --libs foo bar` - # - # the latter works more consistently. - /^[A-Z0-9_]\+CFLAGS = `pkg-config --cflags [^`]\+`$/ { - N - s/${'' - ^\([A-Z0-9_]\+\)CFLAGS = `pkg-config --cflags \(.\+\)`\ - \1LIBS = `pkg-config --libs-only-L .\+$''}/${'' - \1CFLAGS = `pkg-config --cflags \2`\ - \1LIBS = `pkg-config --libs \2`''}/ - } - # fix WebKit libs not being there - s/\$(WEBKIT_LIB) \$(WEBKIT_OBJECTS)$/\0 `pkg-config --libs glib-2.0`/g - ''; - in - '' - declare -a makefiles=(./*.mak) - sed -i -f ${makefile-sed} "''${makefiles[@]}" - # assign Makefile variables eagerly & change backticks to `$(shell …)` - sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \ - -e 's/`\([^`]\+\)`/$(shell \1)/' \ - "''${makefiles[@]}" - ''; - - buildPhase = '' - runHook preBuild - - export JAVA_HOME=${jdk} - - ./build.sh - + # Build the jar + postBuild = '' + cd ../ mkdir out - find org/ -name '*.java' -type f -exec javac -d out/ {} + - - runHook postBuild + find org/ -name '*.java' -type f -exec javac -encoding utf8 -d out/ {} + + # Copy non Java resource files + find org/ -not -name '*.java' -not -name '*.html' -type f -exec cp {} out/{} \; ''; + # The makefile doesn't have an install target, the installation of the shared + # objects is part of the `all` target. installPhase = '' runHook preInstall - if [[ -n "$prefix" ]]; then - install -d -- "$prefix" - fi - - install -Dm 644 -t "$out/lib" -- *.so - install -d -- "$out/jars" install -m 644 -t out -- version.txt (cd out && jar -c *) > "$out/jars/swt.jar" @@ -147,8 +98,14 @@ stdenv.mkDerivation (finalAttrs: { A widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented. ''; - license = lib.licenses.epl10; + license = with lib.licenses; [ + # All of these are located in the about_files directory of the source + ijg + lgpl21 + mpl11 + mpl20 + ]; maintainers = [ ]; - platforms = lib.platforms.linux; + platforms = lib.attrNames finalAttrs.passthru.srcMetadataByPlatform; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/Cargo.lock index fc7f8f744b..4333f1d26f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/Cargo.lock @@ -36,16 +36,16 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.5.0", "brotli", "bytes", @@ -80,27 +80,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] name = "actix-router" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http 0.2.12", "regex", - "serde 1.0.200", + "regex-lite", + "serde 1.0.203", "tracing", ] [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "actix-macros", "futures-core", @@ -109,9 +111,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" +checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" dependencies = [ "actix-rt", "actix-service", @@ -147,9 +149,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -176,32 +178,33 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", - "serde 1.0.200", + "regex-lite", + "serde 1.0.203", "serde_json", "serde_urlencoded", "smallvec", "socket2", "time", - "url 2.5.0", + "url 2.5.2", ] [[package]] name = "actix-web-codegen" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[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", ] @@ -305,9 +308,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -324,9 +327,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" @@ -346,7 +349,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.200", + "serde 1.0.203", "serde_json", ] @@ -358,7 +361,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] @@ -380,9 +383,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -423,7 +426,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "which", ] @@ -460,9 +463,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -471,9 +474,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -517,9 +520,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -557,9 +560,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -614,7 +617,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom 5.1.3", - "serde 1.0.200", + "serde 1.0.203", ] [[package]] @@ -626,7 +629,7 @@ dependencies = [ "lazy_static", "nom 5.1.3", "rust-ini", - "serde 1.0.200", + "serde 1.0.203", "serde-hjson", "serde_json", "toml", @@ -667,18 +670,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -694,9 +697,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -738,6 +741,41 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.67", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.67", +] + [[package]] name = "deadpool" version = "0.7.0" @@ -747,7 +785,7 @@ dependencies = [ "config 0.10.1", "crossbeam-queue", "num_cpus", - "serde 1.0.200", + "serde 1.0.203", "tokio", ] @@ -757,7 +795,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.200", + "serde 1.0.203", "uuid", ] @@ -772,15 +810,15 @@ dependencies = [ [[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.67", ] [[package]] @@ -827,12 +865,6 @@ dependencies = [ "migrations_macros", ] -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "digest" version = "0.10.7" @@ -873,7 +905,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.200", + "serde 1.0.203", "strsim 0.10.0", ] @@ -885,9 +917,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -946,14 +978,14 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "serde 1.0.200", + "serde 1.0.203", ] [[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", @@ -1058,7 +1090,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] @@ -1117,9 +1149,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 = "glob" @@ -1206,7 +1238,7 @@ dependencies = [ "once_cell", "ring", "thiserror", - "url 2.5.0", + "url 2.5.2", ] [[package]] @@ -1296,6 +1328,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + [[package]] name = "http-body" version = "1.0.0" @@ -1308,22 +1351,22 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body", + "http-body 1.0.0", "pin-project-lite", ] [[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" @@ -1337,6 +1380,29 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper" version = "1.3.1" @@ -1347,7 +1413,7 @@ dependencies = [ "futures-channel", "futures-util", "http 1.1.0", - "http-body", + "http-body 1.0.0", "httparse", "itoa", "pin-project-lite", @@ -1358,33 +1424,34 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http 1.1.0", - "hyper", + "hyper 1.3.1", "hyper-util", "rustls", "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body", - "hyper", + "http-body 1.0.0", + "hyper 1.3.1", "pin-project-lite", "socket2", "tokio", @@ -1416,6 +1483,12 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.1.5" @@ -1427,16 +1500,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -1447,12 +1510,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "indexmap" version = "2.2.6" @@ -1525,7 +1582,7 @@ dependencies = [ "base64 0.21.7", "js-sys", "ring", - "serde 1.0.200", + "serde 1.0.203", "serde_json", ] @@ -1562,9 +1619,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1573,7 +1630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -1588,9 +1645,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -1606,9 +1663,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "local-channel" @@ -1651,9 +1708,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1699,9 +1756,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -1720,27 +1777,28 @@ dependencies = [ [[package]] name = "mockito" -version = "0.30.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10030163d67f681db11810bc486df3149e6d91c8b4f3f96fa8b62b546c2cef8" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", "colored", - "difference", - "httparse", - "lazy_static", + "futures-core", + "hyper 0.14.29", "log", "rand", "regex", "serde_json", "serde_urlencoded", + "similar", + "tokio", ] [[package]] name = "mysqlclient-sys" -version = "0.2.5" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61b381528ba293005c42a409dd73d034508e273bf90481f17ec2e964a6e969b" +checksum = "879ce08e38739c54d87b7f8332a476004fe2a095f40a142a36f889779d9942b7" dependencies = [ "pkg-config", "vcpkg", @@ -1803,9 +1861,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -1841,15 +1899,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.200", + "serde 1.0.203", "windows-sys 0.52.0", ] [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1870,9 +1928,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "peeking_take_while" @@ -1909,7 +1967,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] @@ -1974,9 +2032,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1989,9 +2047,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "pyo3" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", "indoc", @@ -2007,9 +2065,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", @@ -2017,9 +2075,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -2027,27 +2085,74 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.60", + "syn 2.0.67", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 1.1.0", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -2102,9 +2207,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.5.0", ] @@ -2122,9 +2227,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2134,9 +2239,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2144,25 +2249,31 @@ dependencies = [ ] [[package]] -name = "regex-syntax" -version = "0.8.3" +name = "regex-lite" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", "futures-core", "futures-util", "http 1.1.0", - "http-body", + "http-body 1.0.0", "http-body-util", - "hyper", + "hyper 1.3.1", "hyper-rustls", "hyper-util", "ipnet", @@ -2172,17 +2283,18 @@ dependencies = [ "once_cell", "percent-encoding 2.3.1", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", - "serde 1.0.200", + "serde 1.0.203", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", "tokio-rustls", "tower-service", - "url 2.5.0", + "url 2.5.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2213,9 +2325,9 @@ checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2223,6 +2335,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -2247,11 +2365,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -2271,15 +2389,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -2288,15 +2406,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2333,15 +2451,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "sentry" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" dependencies = [ "curl", "httpdate", @@ -2354,9 +2472,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79194074f34b0cbe5dd33896e5928bbc6ab63a889bd9df2264af5acb186921e" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" dependencies = [ "backtrace", "once_cell", @@ -2366,9 +2484,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8870c5dba2bfd9db25c75574a11429f6b95957b0a78ac02e2970dd7a5249a" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" dependencies = [ "hostname", "libc", @@ -2380,22 +2498,22 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a75011ea1c0d5c46e9e57df03ce81f5c7f0a9e199086334a1f9c0a541e0826" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" dependencies = [ "once_cell", "rand", "sentry-types", - "serde 1.0.200", + "serde 1.0.203", "serde_json", ] [[package]] name = "sentry-debug-images" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec2a486336559414ab66548da610da5e9626863c3c4ffca07d88f7dc71c8de8" +checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a" dependencies = [ "findshlibs", "once_cell", @@ -2404,9 +2522,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f715932bf369a61b7256687c6f0554141b7ce097287e30e3f7ed6e9de82498fe" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2416,18 +2534,18 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4519c900ce734f7a0eb7aba0869dfb225a7af8820634a7dd51449e3b093cfb7c" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" dependencies = [ "debugid", "hex", "rand", - "serde 1.0.200", + "serde 1.0.203", "serde_json", "thiserror", "time", - "url 2.5.0", + "url 2.5.2", "uuid", ] @@ -2439,9 +2557,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -2460,24 +2578,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", - "serde 1.0.200", + "serde 1.0.203", ] [[package]] @@ -2489,7 +2607,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.200", + "serde 1.0.203", ] [[package]] @@ -2529,6 +2647,12 @@ dependencies = [ "libc", ] +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + [[package]] name = "slab" version = "0.4.9" @@ -2581,7 +2705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" dependencies = [ "chrono", - "serde 1.0.200", + "serde 1.0.203", "serde_json", "slog", ] @@ -2662,10 +2786,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "subtle" -version = "2.5.0" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5" [[package]] name = "syn" @@ -2680,9 +2810,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -2691,13 +2821,13 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "syncserver" -version = "0.17.0" +version = "0.17.9" dependencies = [ "actix-cors", "actix-http", @@ -2711,7 +2841,6 @@ dependencies = [ "docopt", "dyn-clone", "futures 0.3.30", - "futures-util", "hawk", "hex", "hmac", @@ -2722,8 +2851,7 @@ dependencies = [ "rand", "regex", "sentry", - "sentry-backtrace", - "serde 1.0.200", + "serde 1.0.203", "serde_derive", "serde_json", "sha2", @@ -2754,14 +2882,18 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.17.0" +version = "0.17.9" dependencies = [ "actix-web", "backtrace", "cadence", "futures 0.3.30", + "futures-util", "hkdf", - "serde 1.0.200", + "scopeguard", + "sentry", + "sentry-backtrace", + "serde 1.0.203", "serde_json", "sha2", "slog", @@ -2770,7 +2902,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.17.0" +version = "0.17.9" dependencies = [ "backtrace", "deadpool", @@ -2784,21 +2916,21 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.17.0" +version = "0.17.9" dependencies = [ "config 0.11.0", "num_cpus", - "serde 1.0.200", + "serde 1.0.203", "slog-scope", "syncserver-common", "syncstorage-settings", "tokenserver-settings", - "url 2.5.0", + "url 2.5.2", ] [[package]] name = "syncstorage-db" -version = "0.17.0" +version = "0.17.9" dependencies = [ "async-trait", "cadence", @@ -2821,7 +2953,7 @@ dependencies = [ [[package]] name = "syncstorage-db-common" -version = "0.17.0" +version = "0.17.9" dependencies = [ "async-trait", "backtrace", @@ -2831,7 +2963,7 @@ dependencies = [ "futures 0.3.30", "http 1.1.0", "lazy_static", - "serde 1.0.200", + "serde 1.0.203", "serde_json", "syncserver-common", "syncserver-db-common", @@ -2840,7 +2972,7 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.17.0" +version = "0.17.9" dependencies = [ "async-trait", "backtrace", @@ -2858,22 +2990,22 @@ dependencies = [ "syncstorage-db-common", "syncstorage-settings", "thiserror", - "url 2.5.0", + "url 2.5.2", ] [[package]] name = "syncstorage-settings" -version = "0.17.0" +version = "0.17.9" dependencies = [ "rand", - "serde 1.0.200", + "serde 1.0.203", "syncserver-common", "time", ] [[package]] name = "syncstorage-spanner" -version = "0.17.0" +version = "0.17.9" dependencies = [ "async-trait", "backtrace", @@ -2894,7 +3026,7 @@ dependencies = [ "syncstorage-settings", "thiserror", "tokio", - "url 2.5.0", + "url 2.5.2", "uuid", ] @@ -2941,22 +3073,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] @@ -2979,7 +3111,7 @@ dependencies = [ "itoa", "num-conv", "powerfmt", - "serde 1.0.200", + "serde 1.0.203", "time-core", "time-macros", ] @@ -3017,7 +3149,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.17.0" +version = "0.17.9" dependencies = [ "async-trait", "base64 0.22.1", @@ -3031,7 +3163,7 @@ dependencies = [ "pyo3", "reqwest", "ring", - "serde 1.0.200", + "serde 1.0.203", "serde_json", "sha2", "slog-scope", @@ -3044,13 +3176,13 @@ dependencies = [ [[package]] name = "tokenserver-common" -version = "0.17.0" +version = "0.17.9" dependencies = [ "actix-web", "backtrace", "http 1.1.0", "jsonwebtoken", - "serde 1.0.200", + "serde 1.0.203", "serde_json", "syncserver-common", "thiserror", @@ -3059,7 +3191,7 @@ dependencies = [ [[package]] name = "tokenserver-db" -version = "0.17.0" +version = "0.17.9" dependencies = [ "async-trait", "backtrace", @@ -3069,7 +3201,7 @@ dependencies = [ "env_logger 0.11.3", "futures 0.3.30", "http 1.1.0", - "serde 1.0.200", + "serde 1.0.203", "serde_derive", "serde_json", "slog-scope", @@ -3084,18 +3216,18 @@ dependencies = [ [[package]] name = "tokenserver-settings" -version = "0.17.0" +version = "0.17.9" dependencies = [ "jsonwebtoken", - "serde 1.0.200", + "serde 1.0.203", "tokenserver-common", ] [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3111,20 +3243,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -3150,7 +3282,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.200", + "serde 1.0.203", ] [[package]] @@ -3166,7 +3298,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -3189,9 +3320,21 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "tracing-core" version = "0.1.32" @@ -3255,9 +3398,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unindent" @@ -3284,14 +3427,14 @@ dependencies = [ [[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 0.5.0", "percent-encoding 2.3.1", - "serde 1.0.200", + "serde 1.0.203", ] [[package]] @@ -3302,9 +3445,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[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" @@ -3313,48 +3456,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", - "serde 1.0.200", + "serde 1.0.203", ] [[package]] name = "validator" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ - "idna 0.4.0", - "lazy_static", + "idna 0.5.0", + "once_cell", "regex", - "serde 1.0.200", + "serde 1.0.203", "serde_derive", "serde_json", - "url 2.5.0", + "url 2.5.2", ] [[package]] name = "validator_derive" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" dependencies = [ - "if_chain", - "lazy_static", + "darling", + "once_cell", "proc-macro-error", "proc-macro2", "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn 1.0.109", + "syn 2.0.67", ] [[package]] @@ -3427,7 +3558,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", "wasm-bindgen-shared", ] @@ -3461,7 +3592,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3484,9 +3615,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -3723,29 +3854,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.67", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" @@ -3767,9 +3898,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix index 9292cd1677..4c24a889af 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -20,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.17.0"; + version = "0.17.9"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8MxGrE8BaqSN0vPORKupKQuqHiv2vcqQhTX+SnmWFoM="; + hash = "sha256-ezTwAAtt0/jKfA6FtvzuQVFYOODMcD4RFiU3x0Umifk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix index 81f2982a05..103bc58319 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix @@ -27,7 +27,7 @@ buildGoModule rec { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-25Bg8sTeH/w25KdfwgZNoqBXz2d5c1QD5vGb33xpTCA="; + hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock new file mode 100644 index 0000000000..82292ac66c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock @@ -0,0 +1,1774 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.0.2", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.0", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "async-signal" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +dependencies = [ + "async-io 2.3.2", + "async-lock 3.3.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.2", + "futures-io", + "futures-lite 2.3.0", + "piper", + "tracing", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cc" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" + +[[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.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concat-in-place" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b80dba65d26e0c4b692ad0312b837f1177e8175031af57fd1de4f3bc36b430" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[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 = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.60", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "log", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.2", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hidapi" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798154e4b6570af74899d71155fb0072d5b17e6aa12f39c8ef22c60fb8ec99e7" +dependencies = [ + "cc", + "libc", + "pkg-config", + "winapi", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "futures-core", + "inotify-sys", + "libc", + "tokio", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intel-pstate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c22b01d00d25089087e403d1d2533cce061f90ca9cc460d0049be94a3e1d563" +dependencies = [ + "derive_setters", + "smart-default", + "thiserror", +] + +[[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 = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "numtoa" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.2", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "serde" +version = "1.0.199" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.199" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "serde_json" +version = "1.0.116" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smart-default" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysfs-class" +version = "0.1.3" +source = "git+https://github.com/pop-os/sysfs-class#ab63e7f638aadfaf896a02e53cf330343d331337" +dependencies = [ + "numtoa", +] + +[[package]] +name = "system76-power" +version = "1.2.1" +dependencies = [ + "anyhow", + "clap", + "concat-in-place", + "fern", + "futures-lite 2.3.0", + "hidapi", + "inotify", + "intel-pstate", + "libc", + "log", + "once_cell", + "serde", + "serde_json", + "sysfs-class", + "system76-power-zbus", + "thiserror", + "tokio", + "zbus", + "zbus_polkit", + "zvariant", +] + +[[package]] +name = "system76-power-zbus" +version = "1.2.1" +dependencies = [ + "serde", + "zbus", + "zvariant", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.0.2", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.6", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zbus_polkit" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07eb69d4b17d69f78632d4f9b03500f057e80764df8e17ed327f74ac67447813" +dependencies = [ + "enumflags2", + "serde", + "serde_repr", + "static_assertions", + "zbus", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix index 850fac9f6c..5220534d87 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix @@ -2,19 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "system76-power"; - version = "1.1.23"; + version = "1.2.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; rev = version; - sha256 = "sha256-RuYDG4eZE599oa04xUR+W5B3/IPOpQUss1x7hzoydUQ="; + sha256 = "sha256-kYDrSfpOuRigDX792w3hATXoxX6PWpYWXkxw9Q28P5s="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libusb1 ]; - cargoHash = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "sysfs-class-0.1.3" = "sha256-ztfwfCRAkxUd/LLNG5fpVuFdgX+tCKL3F35qYJ2GDm8="; + }; + }; postInstall = '' install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf @@ -28,6 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/system76-power"; license = licenses.gpl3Plus; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ ]; + maintainers = [ maintainers.smonson ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/package.nix index 9378c59ee0..790ae79bc7 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/package.nix @@ -7,7 +7,7 @@ , dbus }: let - version = "2.0.1"; + version = "2.0.2"; in rustPlatform.buildRustPackage { pname = "system76-scheduler"; inherit version; @@ -15,9 +15,9 @@ in rustPlatform.buildRustPackage { owner = "pop-os"; repo = "system76-scheduler"; rev = version; - hash = "sha256-o4noaLBXHDe7pMBHfQ85uzKJzwbBE5mkWq8h9l6iIZs="; + hash = "sha256-5GiHmu++YRCewDHm/qxKmQwDIAZwlW5Eya/fDriVSdA="; }; - cargoHash = "sha256-hpFDAhOzm4v3lBWwAl/10pS5xvKCScdKsp5wpCeQ+FE="; + cargoHash = "sha256-HxNqGe+KrmOoLgaKY9pniPWFF/hehSi1dgZn4LPE7OA="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ dbus pipewire ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch b/third_party/nixpkgs/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch deleted file mode 100644 index ca48d14008..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c0152b6bbd751313be756fdcd7b3e3912567b535 Mon Sep 17 00:00:00 2001 -From: Will Owens -Date: Fri, 1 Mar 2024 01:37:55 -0500 -Subject: [PATCH] nix-build: use nix native llama-cpp package - ---- - crates/llama-cpp-bindings/build.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/crates/llama-cpp-bindings/build.rs b/crates/llama-cpp-bindings/build.rs -index 06629ac4..aa004493 100644 ---- a/crates/llama-cpp-bindings/build.rs -+++ b/crates/llama-cpp-bindings/build.rs -@@ -12,10 +12,10 @@ fn main() { - - println!("cargo:rerun-if-changed=include/engine.h"); - println!("cargo:rerun-if-changed=src/engine.cc"); -+ println!("cargo:rustc-link-search=native={}", env::var("LLAMA_CPP_LIB").unwrap()); - println!("cargo:rustc-link-lib=llama"); -- println!("cargo:rustc-link-lib=ggml_static"); -+ println!("cargo:rustc-link-lib=ggml_shared"); - -- build_llama_cpp(); - build_cxx_binding(); - } - --- -2.43.1 - diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock index a00e9b862f..e310f97d26 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -32,16 +32,16 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "aim-downloader" -version = "0.11.1" +version = "0.18.0" dependencies = [ "async-stream", "clap", @@ -52,7 +52,7 @@ dependencies = [ "indicatif", "netrc", "regex", - "reqwest 0.12.4", + "reqwest", "serial_test 2.0.0", "sha2", "strfmt", @@ -63,9 +63,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -82,160 +82,72 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "apalis" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "apalis-cron", - "apalis-redis", - "apalis-sql", - "futures", - "pin-project-lite", - "serde", - "thiserror", - "tokio", - "tower", - "tracing", - "tracing-futures", -] - -[[package]] -name = "apalis-core" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "async-oneshot", - "futures", - "pin-project-lite", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "ulid", -] - -[[package]] -name = "apalis-cron" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "async-stream", - "chrono", - "cron", - "futures", - "tower", -] - -[[package]] -name = "apalis-redis" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "async-stream", - "async-trait", - "chrono", - "futures", - "log", - "redis", - "serde", - "tokio", -] - -[[package]] -name = "apalis-sql" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "async-stream", - "futures", - "futures-lite", - "log", - "serde", - "serde_json", - "sqlx", - "tokio", -] +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", @@ -274,15 +186,6 @@ dependencies = [ "async-trait", ] -[[package]] -name = "async-oneshot" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae47de2a02d543205f3f5457a90b6ecbc9494db70557bd29590ec8f1ddff5463" -dependencies = [ - "futures-micro", -] - [[package]] name = "async-openai" version = "0.20.0" @@ -291,12 +194,12 @@ checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" dependencies = [ "async-convert", "backoff", - "base64 0.22.0", + "base64 0.22.1", "bytes", - "derive_builder 0.20.0", + "derive_builder", "futures", - "rand", - "reqwest 0.12.4", + "rand 0.8.5", + "reqwest", "reqwest-eventsource", "secrecy", "serde", @@ -327,7 +230,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -338,7 +241,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -350,6 +253,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto_enums" version = "0.8.5" @@ -359,14 +268,14 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -376,7 +285,7 @@ checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", + "base64 0.21.7", "bytes", "futures-util", "http 1.1.0", @@ -384,7 +293,7 @@ dependencies = [ "http-body-util", "hyper 1.3.1", "hyper-util", - "itoa", + "itoa 1.0.11", "matchit", "memchr", "mime", @@ -478,45 +387,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom", + "getrandom 0.2.15", "instant", "pin-project-lite", - "rand", + "rand 0.8.5", "tokio", ] [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -541,18 +444,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] [[package]] name = "bitpacking" -version = "0.8.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" dependencies = [ "crunchy", ] @@ -577,31 +480,38 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", + "regex-automata 0.4.6", "serde", ] [[package]] -name = "bumpalo" -version = "3.13.0" +name = "build-target" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cached" @@ -614,7 +524,7 @@ dependencies = [ "cached_proc_macro", "cached_proc_macro_types", "futures", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "instant", "once_cell", "thiserror", @@ -639,34 +549,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" -[[package]] -name = "cargo-lock" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" -dependencies = [ - "petgraph", - "semver", - "serde", - "toml 0.7.4", - "url", -] - [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] name = "census" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fafee10a5dd1cffcb5cc560e0d0df8803d7355a2b12272e3557dee57314cb6e" +checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" [[package]] name = "cfg-if" @@ -676,9 +574,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -686,7 +584,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -695,15 +593,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "stacker", ] [[package]] name = "clap" -version = "4.4.11" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -711,33 +609,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" @@ -749,20 +647,37 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "color-eyre" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" dependencies = [ - "termcolor", - "unicode-width", + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", ] [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -777,31 +692,17 @@ dependencies = [ "unreachable", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", -] - [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -811,10 +712,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] -name = "core-foundation" -version = "0.9.3" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -822,24 +729,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -852,9 +759,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -872,36 +779,30 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] @@ -915,9 +816,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -935,66 +836,39 @@ dependencies = [ "typenum", ] +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.66", +] + [[package]] name = "custom_error" version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" -[[package]] -name = "cxx" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109308c20e8445959c2792e81871054c6a17e6976489a93d2769641a2ba5839c" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf4c6755cdf10798b97510e0e2b3edb9573032bd9379de8fffa59d68165494f" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.52", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882074421238e84fe3b4c65d0081de34e5b323bf64555d3e61991f76eb64a7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a076022ece33e7686fb76513518e219cca4fce5750a8ae6d1ce6c0f48fd1af9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.14.4" @@ -1007,26 +881,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1045,27 +905,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.52", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] @@ -1081,13 +930,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1097,23 +946,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1130,55 +979,13 @@ dependencies = [ "serde", ] -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro 0.11.2", -] - -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro 0.12.0", -] - [[package]] name = "derive_builder" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "derive_builder_macro 0.20.0", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", + "derive_builder_macro", ] [[package]] @@ -1187,30 +994,10 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.52", -] - -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core 0.11.2", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core 0.12.0", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1219,8 +1006,21 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ - "derive_builder_core 0.20.0", - "syn 2.0.52", + "derive_builder_core", + "syn 2.0.66", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", ] [[package]] @@ -1231,7 +1031,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1254,26 +1054,41 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" dependencies = [ "serde", ] [[package]] name = "email-encoding" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "memchr", ] @@ -1290,14 +1105,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "encoding_rs" -version = "0.8.32" +name = "encoder" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "03f6928ad5c6efcdae42eb068dff8a555ef2f057c92bbd491ddf5610f6444987" +dependencies = [ + "encoder-ryu", + "indexmap 2.2.6", + "serde_json", + "simd-json", +] + +[[package]] +name = "encoder-ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e27addc39f5f73c85604bfe21b59fe93717f9765194015d92bde1db11e8ccef" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] +[[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1306,23 +1148,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1354,25 +1185,26 @@ dependencies = [ ] [[package]] -name = "fastdivide" -version = "0.4.0" +name = "eyre" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ - "instant", + "indenter", + "once_cell", ] [[package]] -name = "fastrand" -version = "2.0.1" +name = "fastdivide" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fid-rs" @@ -1384,35 +1216,22 @@ dependencies = [ ] [[package]] -name = "file-rotate" -version = "0.7.5" +name = "flate2" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf221ceec4517f3cb764dae3541b2bd87666fc8832e51322fbb97250b468c71" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ - "chrono", - "flate2", + "crc32fast", + "miniz_oxide", ] [[package]] -name = "finl_unicode" -version = "1.2.0" +name = "float-cmp" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", + "num-traits", ] [[package]] @@ -1456,24 +1275,14 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "fs4" -version = "0.6.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" dependencies = [ - "rustix 0.38.17", - "windows-sys 0.48.0", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -1483,10 +1292,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] -name = "futures" -version = "0.3.28" +name = "futf" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1499,9 +1318,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1509,15 +1328,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1532,71 +1351,49 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.12.1", + "parking_lot", ] [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.0.1", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", -] - -[[package]] -name = "futures-micro" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" -dependencies = [ - "pin-project-lite", + "syn 2.0.66", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1621,15 +1418,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", "libc", "log", "rustversion", - "windows", + "windows 0.48.0", ] [[package]] @@ -1644,22 +1441,33 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" @@ -1667,7 +1475,7 @@ version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -1678,23 +1486,23 @@ dependencies = [ [[package]] name = "gitlab" -version = "0.1610.0" +version = "0.1700.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c802fc7eb82ff5ba2e4447c5acd0f18ec1b7bb95dbe95b6d77639e25be7cbe" +checksum = "65f36adc608cffeec1cc08ecf1977c038cbb1af9184b2174ca006ebeb817991c" dependencies = [ "async-trait", - "base64 0.13.1", + "base64 0.22.1", "bytes", "chrono", "cron", - "derive_builder 0.11.2", + "derive_builder", "futures-util", "graphql_client", - "http 0.2.11", - "itertools 0.10.5", + "http 1.1.0", + "itertools 0.12.1", "log", "percent-encoding", - "reqwest 0.11.22", + "reqwest", "serde", "serde_json", "serde_urlencoded", @@ -1702,12 +1510,6 @@ dependencies = [ "url", ] -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - [[package]] name = "globset" version = "0.4.14" @@ -1718,17 +1520,7 @@ dependencies = [ "bstr", "log", "regex-automata 0.4.6", - "regex-syntax 0.8.2", -] - -[[package]] -name = "globwalk" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9db17aec586697a93219b19726b5b68307eba92898c34b170857343fe67c99d" -dependencies = [ - "ignore", - "walkdir", + "regex-syntax 0.8.3", ] [[package]] @@ -1746,15 +1538,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" dependencies = [ - "combine 3.8.1", + "combine", "thiserror", ] [[package]] name = "graphql_client" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc" +checksum = "a50cfdc7f34b7f01909d55c2dcb71d4c13cbcbb4a1605d6c8bd760d654c1144b" dependencies = [ "graphql_query_derive", "serde", @@ -1763,13 +1555,13 @@ dependencies = [ [[package]] name = "graphql_client_codegen" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9" +checksum = "5e27ed0c2cf0c0cc52c6bcf3b45c907f433015e580879d14005386251842fb0a" dependencies = [ "graphql-introspection-query", "graphql-parser", - "heck", + "heck 0.4.1", "lazy_static", "proc-macro2", "quote", @@ -1780,9 +1572,9 @@ dependencies = [ [[package]] name = "graphql_query_derive" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" +checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", "proc-macro2", @@ -1790,35 +1582,95 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.3.19" +name = "grep" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "6e2b024ec1e686cb64d78beb852030b0e632af93817f1ed25be0173af0e94939" dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.11", - "indexmap 1.9.3", - "slab", - "tokio", - "tokio-util", - "tracing", + "grep-cli", + "grep-matcher", + "grep-printer", + "grep-regex", + "grep-searcher", +] + +[[package]] +name = "grep-cli" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea40788c059ab8b622c4d074732750bfb3bd2912e2dd58eabc11798a4d5ad725" +dependencies = [ + "bstr", + "globset", + "libc", + "log", + "termcolor", + "winapi-util", +] + +[[package]] +name = "grep-matcher" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" +dependencies = [ + "memchr", +] + +[[package]] +name = "grep-printer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743c12a03c8aee38b6e5bd0168d8ebb09345751323df4a01c56e792b1f38ceb2" +dependencies = [ + "bstr", + "grep-matcher", + "grep-searcher", + "log", + "serde", + "serde_json", + "termcolor", +] + +[[package]] +name = "grep-regex" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" +dependencies = [ + "bstr", + "grep-matcher", + "log", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "grep-searcher" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" +dependencies = [ + "bstr", + "encoding_rs", + "encoding_rs_io", + "grep-matcher", + "log", + "memchr", + "memmap2", ] [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", "indexmap 2.2.6", "slab", @@ -1828,10 +1680,18 @@ dependencies = [ ] [[package]] -name = "hash-ids" -version = "0.2.1" +name = "halfbrown" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9289cbc8064a1c2f505c92d4d17f7fe5050d487728c19cee7936bd204069bc9d" +checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" +dependencies = [ + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "hash-ids" +version = "0.18.0" [[package]] name = "hashbrown" @@ -1841,9 +1701,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1855,7 +1715,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1864,7 +1724,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "headers-core", "http 1.1.0", @@ -1892,19 +1752,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1932,22 +1789,60 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows 0.52.0", +] + +[[package]] +name = "htmd" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fff09744b11deed5946dd1b61c806bb9a94ded93cf28da819935599b69b987" +dependencies = [ + "html5ever 0.27.0", + "markup5ever_rcdom", +] + +[[package]] +name = "html5ever" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever 0.10.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -1958,13 +1853,13 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.11", ] [[package]] @@ -1975,35 +1870,36 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.11", ] [[package]] name = "http-api-bindings" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "async-openai", "async-stream", "async-trait", "futures", - "reqwest 0.12.4", + "ollama-api-bindings", + "reqwest", "reqwest-eventsource", "serde", "serde_json", "tabby-common", "tabby-inference", - "tracing", + "tokio", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -2030,12 +1926,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" - [[package]] name = "httparse" version = "1.8.0" @@ -2044,9 +1934,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2056,22 +1946,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.19", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", - "itoa", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2087,32 +1976,18 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", + "h2", "http 1.1.0", "http-body 1.0.0", "httparse", "httpdate", - "itoa", + "itoa 1.0.11", "pin-project-lite", "smallvec", "tokio", "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.11", - "hyper 0.14.27", - "rustls 0.21.10", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.26.0" @@ -2124,11 +1999,11 @@ dependencies = [ "hyper 1.3.1", "hyper-util", "log", - "rustls 0.22.4", + "rustls", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "tower-service", ] @@ -2163,9 +2038,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -2174,7 +2049,7 @@ dependencies = [ "http-body 1.0.0", "hyper 1.3.1", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio", "tower", "tower-service", @@ -2183,16 +2058,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2210,16 +2085,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -2230,12 +2095,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "ignore" version = "0.4.22" @@ -2252,6 +2111,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.9.3" @@ -2269,15 +2134,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2288,9 +2153,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -2299,14 +2164,13 @@ dependencies = [ "pest_derive", "serde", "similar", - "yaml-rust", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -2314,22 +2178,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iri-string" @@ -2342,22 +2195,10 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.10.5" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -2369,36 +2210,52 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "9.1.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", + "js-sys", "pem", "ring", "serde", @@ -2434,6 +2291,7 @@ checksum = "1f81e883bc6ffb2e5a3cc7276bfe9519c49108bdc1330d5aab1b79cb088f2f26" dependencies = [ "axum", "bytes", + "futures", "juniper", "juniper_graphql_ws", "serde", @@ -2448,7 +2306,7 @@ checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "url", ] @@ -2475,27 +2333,15 @@ dependencies = [ ] [[package]] -name = "kdam" -version = "0.5.0" +name = "kuchiki" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e352f4e1acc6a3d0919eaeb014ca63e5da9450a12ef7106fe2936a07a1648d44" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ - "terminal_size", - "windows-sys 0.48.0", -] - -[[package]] -name = "kv" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620727085ac39ee9650b373fe6d8073a0aee6f99e52a9c72b25f7671078039ab" -dependencies = [ - "pin-project-lite", - "serde", - "serde_json", - "sled", - "thiserror", - "toml 0.5.11", + "cssparser", + "html5ever 0.25.2", + "matches", + "selectors", ] [[package]] @@ -2509,26 +2355,27 @@ dependencies = [ [[package]] name = "lettre" -version = "0.11.3" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5aaf628956b6b0852e12ac3505d20d7a12ecc1e32d5ea921f002af4a74036a5" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" dependencies = [ "async-trait", - "base64 0.21.5", + "base64 0.22.1", "chumsky", "email-encoding", "email_address", - "fastrand 2.0.1", + "fastrand", "futures-io", "futures-util", "hostname", "httpdate", - "idna 0.5.0", + "idna", "mime", "native-tls", "nom", + "percent-encoding", "quoted_printable", - "socket2 0.5.5", + "socket2", "tokio", "tokio-native-tls", "url", @@ -2541,10 +2388,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" [[package]] -name = "libc" -version = "0.2.149" +name = "lexical-core" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -2603,9 +2514,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -2613,15 +2524,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2630,37 +2532,36 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[package]] -name = "llama-cpp-bindings" -version = "0.11.1" +name = "llama-cpp-server" +version = "0.18.0" dependencies = [ - "async-stream", + "anyhow", + "async-openai", "async-trait", "cmake", - "cxx", - "cxx-build", - "derive_builder 0.12.0", "futures", + "http-api-bindings", + "omnicopy_to_output", + "reqwest", + "serde", + "serdeconv", + "tabby-common", "tabby-inference", "tokio", "tracing", + "which", ] [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2668,9 +2569,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "logkit" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b517d00135d2ea552dc1f6cbc5da9d8953f895c91db680c288d53c50ca309767" +dependencies = [ + "backtrace", + "chrono", + "encoder", +] [[package]] name = "loom" @@ -2683,7 +2595,7 @@ dependencies = [ "pin-utils", "scoped-tls", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber", ] [[package]] @@ -2697,32 +2609,69 @@ dependencies = [ [[package]] name = "lru" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" [[package]] -name = "match_cfg" -version = "0.1.0" +name = "mac" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] -name = "matchers" -version = "0.0.1" +name = "maplit" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ - "regex-automata 0.1.10", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf 0.11.2", + "phf_codegen 0.11.2", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" +dependencies = [ + "html5ever 0.27.0", + "markup5ever 0.12.1", + "tendril", + "xml5ever", ] [[package]] @@ -2735,10 +2684,16 @@ dependencies = [ ] [[package]] -name = "matchit" -version = "0.7.0" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" @@ -2752,9 +2707,9 @@ dependencies = [ [[package]] name = "measure_time" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56220900f1a0923789ecd6bf25fbae8af3b2f1ff3e9e297fc9b6b8674dd4d852" +checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" dependencies = [ "instant", "log", @@ -2768,28 +2723,13 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] -[[package]] -name = "memo-map" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "metrics" version = "0.22.3" @@ -2806,8 +2746,8 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ - "base64 0.21.5", - "hyper 0.14.27", + "base64 0.21.7", + "hyper 0.14.28", "indexmap 2.2.6", "ipnet", "metrics", @@ -2825,7 +2765,7 @@ checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "metrics", "num_cpus", "quanta", @@ -2848,17 +2788,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minijinja" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80084fa3099f58b7afab51e5f92e24c2c2c68dcad26e96ad104bd6011570461d" -dependencies = [ - "memo-map", - "self_cell", - "serde", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2867,46 +2796,36 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] [[package]] name = "murmurhash32" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9380db4c04d219ac5c51d14996bbf2c2e9a15229771b53f8671eb6c83cf44df" +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2924,6 +2843,18 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "nom" version = "7.1.3" @@ -2934,17 +2865,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "npm-package-json" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df163f89771bd6654d5e116952b9ab2d0b952cd8e3315ddaa615f6d2bfbb1fde" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -2971,7 +2891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" dependencies = [ "nucleo-matcher", - "parking_lot 0.12.1", + "parking_lot", "rayon", ] @@ -2987,11 +2907,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3008,7 +2927,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -3019,32 +2938,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3053,9 +2960,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3063,19 +2970,19 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -3111,9 +3018,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3126,7 +3033,7 @@ checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367" dependencies = [ "arc-swap", "async-trait", - "base64 0.22.0", + "base64 0.22.1", "bytes", "cfg-if", "chrono", @@ -3137,7 +3044,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-rustls 0.26.0", + "hyper-rustls", "hyper-timeout", "hyper-util", "jsonwebtoken", @@ -3157,6 +3064,45 @@ dependencies = [ "url", ] +[[package]] +name = "ollama-api-bindings" +version = "0.18.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "futures", + "ollama-rs", + "tabby-common", + "tabby-inference", + "tracing", +] + +[[package]] +name = "ollama-rs" +version = "0.1.9" +source = "git+https://github.com/pepperoni21/ollama-rs.git?rev=56e8157d98d4185bc171fe9468d3d09bc56e9dd3#56e8157d98d4185bc171fe9468d3d09bc56e9dd3" +dependencies = [ + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "url", +] + +[[package]] +name = "omnicopy_to_output" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10aff4d07c3656c416a997301d51ed83be62cbb256b421f86b014931217f2393" +dependencies = [ + "anyhow", + "build-target", + "fs_extra", + "project-root", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -3165,20 +3111,19 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oneshot" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb" +version = "0.1.6" +source = "git+https://github.com/fulmicoton/oneshot.git?rev=b208f49#b208f493e505f5f37e180b5cdec4c22b6f99abaa" dependencies = [ "loom", ] [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -3195,7 +3140,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3206,18 +3151,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -3265,7 +3210,7 @@ dependencies = [ "once_cell", "opentelemetry_api", "percent-encoding", - "rand", + "rand 0.8.5", "thiserror", ] @@ -3277,77 +3222,39 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8a72b918ae8198abb3a18c190288123e1d442b6b9a7d709305fd194688b4b7" +version = "0.7.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "stable_deref_trait", ] [[package]] -name = "package-lock-json-parser" -version = "0.4.0" +name = "owo-colors" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8707d34f4a67f9c733970b8afc7b82d8623bc0746ff17b460aa6f2ea5ef487d3" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -3367,23 +3274,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pem" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "serde", ] @@ -3404,9 +3311,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -3415,9 +3322,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -3425,22 +3332,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -3448,40 +3355,141 @@ dependencies = [ ] [[package]] -name = "petgraph" -version = "0.6.3" +name = "phf" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "fixedbitset", - "indexmap 1.9.3", + "phf_macros", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3512,15 +3520,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.3.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "powerfmt" @@ -3534,6 +3542,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3559,14 +3573,26 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-hack" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] +[[package]] +name = "project-root" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" + [[package]] name = "psm" version = "0.1.21" @@ -3586,7 +3612,7 @@ dependencies = [ "libc", "once_cell", "raw-cpuid", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -3599,9 +3625,9 @@ checksum = "9318ead08c799aad12a55a3e78b82e0b6167271ffd1f627b758891282f739187" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3612,6 +3638,20 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + [[package]] name = "rand" version = "0.8.5" @@ -3619,8 +3659,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -3630,7 +3680,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", ] [[package]] @@ -3639,7 +3698,35 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -3648,14 +3735,14 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3663,55 +3750,64 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] -name = "redis" -version = "0.25.3" +name = "readable-readability" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" +checksum = "c17015928a25bff296b0471dfa7a784e406664e1d091781db66e885b18708a8d" dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "combine 4.6.7", - "futures", - "futures-util", - "itoa", - "percent-encoding", - "pin-project-lite", - "ryu", - "sha1_smol", - "tokio", - "tokio-retry", - "tokio-util", + "html5ever 0.25.2", + "kuchiki", + "lazy_static", + "log", + "regex", "url", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", +] + +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -3723,7 +3819,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3743,7 +3839,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3754,62 +3850,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "requirements" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2643e903f79d8e6bc310ee0def974d12a33561d14e0728511b6ba5e8be0791c3" -dependencies = [ - "globwalk", - "pest", - "pest_derive", - "regex", - "walkdir", -] - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "base64 0.21.5", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.19", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.27", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.10", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.50.0", -] +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" @@ -3817,17 +3860,18 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2 0.4.4", + "h2", "http 1.1.0", "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-rustls 0.26.0", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -3839,9 +3883,9 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.4", + "rustls", "rustls-native-certs", - "rustls-pemfile 2.1.2", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -3850,7 +3894,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.25.0", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -3858,7 +3902,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "webpki-roots", + "winreg", ] [[package]] @@ -3873,29 +3918,30 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest 0.12.4", + "reqwest", "thiserror", ] [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom", + "cfg-if", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rmp" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -3904,9 +3950,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -3926,7 +3972,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "signature", "spki", "subtle", @@ -3935,9 +3981,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.0.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3946,22 +3992,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.0.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.52", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.0.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2", "walkdir", @@ -3979,9 +4025,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3990,42 +4036,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustix" -version = "0.37.19" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", + "semver", ] [[package]] name = "rustix" -version = "0.38.17" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4037,7 +4066,7 @@ dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.3", + "rustls-webpki", "subtle", "zeroize", ] @@ -4049,52 +4078,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.2", + "rustls-pemfile", "rustls-pki-types", "schannel", "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.5", -] - [[package]] name = "rustls-pemfile" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -4103,15 +4113,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -4123,12 +4133,21 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.21" +name = "scc" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" dependencies = [ - "windows-sys 0.42.0", + "sdd", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", ] [[package]] @@ -4139,25 +4158,15 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scratch" -version = "1.0.5" +name = "sdd" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" [[package]] name = "secrecy" @@ -4171,11 +4180,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -4184,48 +4193,49 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "self_cell" -version = "1.0.1" +name = "selectors" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-jsonlines" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4684abdec99c1de7e507a3516c82385ff74d54c385973846b079bfd9f5920d35" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "serde-jsonlines" version = "0.5.0" @@ -4238,40 +4248,41 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ - "itoa", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ + "itoa 1.0.11", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4283,7 +4294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.11", "ryu", "serde", ] @@ -4297,7 +4308,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "toml 0.7.4", + "toml", "trackable", ] @@ -4311,22 +4322,22 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot", "serial_test_derive 2.0.0", ] [[package]] name = "serial_test" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" dependencies = [ - "dashmap", "futures", - "lazy_static", "log", - "parking_lot 0.12.1", - "serial_test_derive 3.0.0", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive 3.1.1", ] [[package]] @@ -4337,18 +4348,28 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "serial_test_derive" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", ] [[package]] @@ -4362,12 +4383,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.10.8" @@ -4379,33 +4394,20 @@ dependencies = [ "digest", ] -[[package]] -name = "sha256" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386" -dependencies = [ - "async-trait", - "bytes", - "hex", - "sha2", - "tokio", -] - [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -4417,14 +4419,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core", + "rand_core 0.6.4", ] [[package]] -name = "similar" -version = "2.3.0" +name = "simd-json" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" +dependencies = [ + "getrandom 0.2.15", + "halfbrown", + "lexical-core", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simple_asn1" @@ -4439,39 +4463,29 @@ dependencies = [ ] [[package]] -name = "sketches-ddsketch" -version = "0.2.1" +name = "siphasher" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sketches-ddsketch" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" dependencies = [ "serde", ] [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] -[[package]] -name = "sled" -version = "0.34.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot 0.11.2", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -4491,43 +4505,33 @@ dependencies = [ [[package]] name = "snafu" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +checksum = "418b8136fec49956eba89be7da2847ec1909df92a9ae4178b5ff0ff092c8d95e" dependencies = [ "snafu-derive", ] [[package]] name = "snafu-derive" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +checksum = "1a4812a669da00d17d8266a0439eddcacbc88b17f732f927e52eeb9d196f7fb5" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4545,6 +4549,17 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spinners" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82" +dependencies = [ + "lazy_static", + "maplit", + "strum 0.24.1", +] + [[package]] name = "spki" version = "0.7.3" @@ -4557,9 +4572,9 @@ dependencies = [ [[package]] name = "sql_query_builder" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b371e496dc275fae413896ef31160eaeb949df66a942245cf3f37fb741389611" +checksum = "a85dbaf3c8d08abe8a95a51860550236a07bd6fc097e2bff054ad8c2bf9a0df5" [[package]] name = "sqlformat" @@ -4575,8 +4590,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4588,8 +4602,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "ahash", "atoi", @@ -4613,8 +4626,6 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls 0.21.10", - "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -4625,14 +4636,12 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots", ] [[package]] name = "sqlx-macros" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "proc-macro2", "quote", @@ -4644,12 +4653,11 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4670,12 +4678,11 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.0", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -4691,13 +4698,13 @@ dependencies = [ "hex", "hkdf", "hmac", - "itoa", + "itoa 1.0.11", "log", "md-5", "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "serde", "sha1", @@ -4713,12 +4720,11 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.0", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -4732,12 +4738,12 @@ dependencies = [ "hkdf", "hmac", "home", - "itoa", + "itoa 1.0.11", "log", "md-5", "memchr", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha2", @@ -4752,8 +4758,7 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "atoi", "chrono", @@ -4805,21 +4810,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" [[package]] -name = "stringprep" -version = "0.1.4" +name = "string_cache" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", ] [[package]] -name = "strsim" -version = "0.9.3" +name = "string_cache_codegen" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] [[package]] name = "strsim" @@ -4827,13 +4852,28 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", +] + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros 0.26.2", ] [[package]] @@ -4842,13 +4882,26 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.66", +] + [[package]] name = "subtle" version = "2.5.0" @@ -4868,9 +4921,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -4891,9 +4944,9 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sysinfo" -version = "0.29.8" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10ed79c22663a35a255d289a7fdcb43559fc77ff15df5ce6c341809e7867528" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4927,51 +4980,48 @@ dependencies = [ [[package]] name = "tabby" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "assert-json-diff", + "async-openai", "async-stream", "async-trait", "axum", "axum-extra", "axum-prometheus", - "cached", "chrono", "clap", + "color-eyre", "futures", "http-api-bindings", "hyper 1.3.1", "insta", "lazy_static", - "llama-cpp-bindings", - "minijinja", + "llama-cpp-server", "nvml-wrapper", "openssl", - "parse-git-url", - "regex", - "reqwest 0.12.4", + "reqwest", "reqwest-eventsource", "serde", - "serde-jsonlines 0.5.0", + "serde-jsonlines", "serde_json", "serdeconv", - "serial_test 3.0.0", + "serial_test 3.1.1", + "spinners", "strfmt", - "strum", + "strum 0.24.1", "sysinfo", "tabby-common", "tabby-download", "tabby-inference", - "tabby-scheduler", "tabby-webserver", "tantivy", - "textdistance", "thiserror", "tokio", "tower-http", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber", "utoipa", "utoipa-swagger-ui", "uuid", @@ -4980,30 +5030,54 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "async-trait", - "glob", + "axum", + "axum-extra", + "chrono", + "derive_builder", + "hash-ids", "home", "lazy_static", - "reqwest 0.12.4", + "parse-git-url", + "reqwest", "serde", - "serde-jsonlines 0.4.0", "serde_json", "serdeconv", "tantivy", "temp_testdir", "thiserror", "tokio", + "tracing", "url", "utoipa", "uuid", ] +[[package]] +name = "tabby-crawler" +version = "0.18.0" +dependencies = [ + "anyhow", + "async-stream", + "futures", + "htmd", + "logkit", + "readable-readability", + "regex", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-test", + "url", +] + [[package]] name = "tabby-db" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "assert_matches", @@ -5011,6 +5085,7 @@ dependencies = [ "chrono", "hash-ids", "lazy_static", + "serde", "sql_query_builder", "sqlx", "tabby-db-macros", @@ -5020,88 +5095,123 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.11.1" +version = "0.18.0" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "tabby-download" -version = "0.11.1" +version = "0.18.0" dependencies = [ "aim-downloader", "anyhow", - "sha256", "tabby-common", "tokio-retry", "tracing", ] [[package]] -name = "tabby-inference" -version = "0.11.1" +name = "tabby-git" +version = "0.18.0" +dependencies = [ + "anyhow", + "assert_matches", + "async-stream", + "axum", + "futures", + "git2", + "grep", + "ignore", + "mime_guess", + "nucleo", + "serde", + "serde_json", + "temp_testdir", + "tokio", + "tracing", +] + +[[package]] +name = "tabby-index" +version = "0.18.0" dependencies = [ "anyhow", "async-stream", "async-trait", - "dashmap", - "derive_builder 0.12.0", + "chrono", "futures", - "tabby-common", - "trie-rs", -] - -[[package]] -name = "tabby-scheduler" -version = "0.11.1" -dependencies = [ - "anyhow", - "async-trait", - "cargo-lock", - "file-rotate", + "git2", "ignore", - "kdam", - "kv", + "insta", "lazy_static", - "npm-package-json", - "package-lock-json-parser", - "requirements", + "logkit", "serde", - "serde-jsonlines 0.4.0", "serde_json", - "serdeconv", + "serial_test 3.1.1", "tabby-common", + "tabby-inference", "tantivy", "temp_testdir", "text-splitter", "tokio", - "tokio-cron-scheduler", "tracing", + "tracing-subscriber", "tracing-test", "tree-sitter-c", "tree-sitter-c-sharp", "tree-sitter-cpp", + "tree-sitter-elixir", "tree-sitter-go", "tree-sitter-java", "tree-sitter-kotlin", + "tree-sitter-lua", "tree-sitter-python", "tree-sitter-ruby", "tree-sitter-rust", "tree-sitter-solidity", "tree-sitter-tags", "tree-sitter-typescript", - "yarn-lock-parser", +] + +[[package]] +name = "tabby-index-cli" +version = "0.18.0" +dependencies = [ + "anyhow", + "clap", + "serde", + "serde_json", + "tabby-common", + "tantivy", +] + +[[package]] +name = "tabby-inference" +version = "0.18.0" +dependencies = [ + "anyhow", + "async-openai", + "async-stream", + "async-trait", + "dashmap", + "derive_builder", + "futures", + "reqwest", + "secrecy", + "tabby-common", + "trie-rs", ] [[package]] name = "tabby-schema" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "async-trait", "axum", - "base64 0.22.0", + "base64 0.22.1", "chrono", "futures", "hash-ids", @@ -5109,71 +5219,66 @@ dependencies = [ "lazy_static", "regex", "serde", - "strum", + "strum 0.24.1", "tabby-common", "tabby-db", "thiserror", "tokio", "tracing", + "url", "validator", ] -[[package]] -name = "tabby-search" -version = "0.11.1" -dependencies = [ - "anyhow", - "git2", - "nucleo", - "temp_testdir", -] - [[package]] name = "tabby-webserver" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", - "apalis", "argon2", "assert_matches", + "async-openai", + "async-stream", "async-trait", "axum", "axum-extra", "bincode", "chrono", + "cron", "fs_extra", "futures", "gitlab", "hyper 1.3.1", - "hyper-util", + "insta", "jsonwebtoken", "juniper", "juniper_axum", "juniper_graphql_ws", "lazy_static", "lettre", + "logkit", "mime_guess", "octocrab", "pin-project", "querystring", - "reqwest 0.12.4", + "reqwest", "rust-embed", "serde", "serde_json", - "serial_test 3.0.0", + "serial_test 3.1.1", + "strum 0.24.1", "tabby-common", + "tabby-crawler", "tabby-db", + "tabby-git", + "tabby-index", + "tabby-inference", "tabby-schema", - "tabby-search", "tarpc", "temp_testdir", "thiserror", "tokio", "tokio-tungstenite", - "tower", - "tower-http", "tracing", - "unicase", "url", "urlencoding", "uuid", @@ -5181,14 +5286,12 @@ dependencies = [ [[package]] name = "tantivy" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d4675fed6fe2218ce11445374e181e864a8ffd0f28e7e0591ccfc38cd000ae" +version = "0.23.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "aho-corasick", "arc-swap", - "async-trait", - "base64 0.21.5", + "base64 0.22.1", "bitpacking", "byteorder", "census", @@ -5196,17 +5299,16 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "fastdivide", + "fnv", "fs4", "htmlescape", - "itertools 0.11.0", + "itertools 0.13.0", "levenshtein_automata", "log", "lru", "lz4_flex", "measure_time", "memmap2", - "murmurhash32", - "num_cpus", "once_cell", "oneshot", "rayon", @@ -5233,22 +5335,20 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecb164321482301f514dd582264fa67f70da2d7eb01872ccd71e35e0d96655a" +version = "0.6.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "bitpacking", ] [[package]] name = "tantivy-columnar" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d85f8019af9a78b3118c11298b36ffd21c2314bd76bbcd9d12e00124cbb7e70" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ + "downcast-rs", "fastdivide", - "fnv", - "itertools 0.11.0", + "itertools 0.13.0", "serde", "tantivy-bitpacker", "tantivy-common", @@ -5258,9 +5358,8 @@ dependencies = [ [[package]] name = "tantivy-common" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4a3a975e604a2aba6b1106a04505e1e7a025e6def477fab6e410b4126471e1" +version = "0.7.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "async-trait", "byteorder", @@ -5271,30 +5370,29 @@ dependencies = [ [[package]] name = "tantivy-fst" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3c506b1a8443a3a65352df6382a1fb6a7afe1a02e871cee0d25e2c3d5f3944" +checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" dependencies = [ "byteorder", - "regex-syntax 0.6.29", + "regex-syntax 0.8.3", "utf8-ranges", ] [[package]] name = "tantivy-query-grammar" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d39c5a03100ac10c96e0c8b07538e2ab8b17da56434ab348309b31f23fada77" +version = "0.22.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "nom", ] [[package]] name = "tantivy-sstable" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0c1bb43e5e8b8e05eb8009610344dbf285f06066c844032fbb3e546b3c71df" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ + "tantivy-bitpacker", "tantivy-common", "tantivy-fst", "zstd", @@ -5302,19 +5400,18 @@ dependencies = [ [[package]] name = "tantivy-stacker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c078595413f13f218cf6f97b23dcfd48936838f1d3d13a1016e05acd64ed6c" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "murmurhash32", + "rand_distr", "tantivy-common", ] [[package]] name = "tantivy-tokenizer-api" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347b6fb212b26d3505d224f438e3c4b827ab8bd847fe9953ad5ac6b8f9443b66" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "serde", ] @@ -5331,7 +5428,7 @@ dependencies = [ "humantime", "opentelemetry", "pin-project", - "rand", + "rand 0.8.5", "serde", "static_assertions", "tarpc-plugins", @@ -5362,82 +5459,85 @@ checksum = "921f1e9c427802414907a48b21a6504ff6b3a15a1a3cf37e699590949ad9befc" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 1.9.0", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix 0.38.17", - "windows-sys 0.48.0", -] - [[package]] name = "text-splitter" -version = "0.10.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5315f993b00372fd909fcf8587535e65f03ac5fd9400f49dd72ce1f6be23cf" +checksum = "2ab9dc04b7cf08eb01c07c272bf699fa55679a326ddf7dd075e14094efc80fb9" dependencies = [ "ahash", "auto_enums", "either", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "regex", + "strum 0.26.2", + "thiserror", + "tree-sitter", "unicode-segmentation", ] [[package]] -name = "textdistance" -version = "1.0.2" +name = "thin-slice" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -5450,7 +5550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa", + "itoa 1.0.11", "libc", "num-conv", "num_threads", @@ -5493,38 +5593,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] -[[package]] -name = "tokio-cron-scheduler" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2c1fd54a857b29c6cd1846f31903d0ae8e28175615c14a277aed45c58d8e27" -dependencies = [ - "chrono", - "cron", - "num-derive", - "num-traits", - "tokio", - "tracing", - "uuid", -] - [[package]] name = "tokio-macros" version = "2.2.0" @@ -5533,7 +5618,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -5553,17 +5638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.10", + "rand 0.8.5", "tokio", ] @@ -5573,7 +5648,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.4", + "rustls", "rustls-pki-types", "tokio", ] @@ -5592,9 +5667,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5615,36 +5690,26 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -5654,20 +5719,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -5697,21 +5762,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "bytes", "futures-util", "http 1.1.0", "http-body 1.0.0", "http-body-util", - "http-range-header", - "httpdate", "iri-string", - "mime", - "mime_guess", - "percent-encoding", "pin-project-lite", "tokio", - "tokio-util", "tower", "tower-layer", "tower-service", @@ -5732,11 +5791,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5745,42 +5803,43 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] [[package]] -name = "tracing-futures" -version = "0.2.5" +name = "tracing-error" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", + "tracing-subscriber", ] [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5794,48 +5853,16 @@ dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-subscriber 0.3.17", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", + "tracing-subscriber", ] [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", "regex", @@ -5849,21 +5876,21 @@ dependencies = [ [[package]] name = "tracing-test" -version = "0.1.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b48778c2d401c6a7fcf38a0e3c55dc8e8e753cbd381044a8cdb6fd69a29f53" +checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" dependencies = [ "lazy_static", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", "tracing-test-macro", ] [[package]] name = "tracing-test-macro" -version = "0.1.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49adbab879d2e0dd7f75edace5f0ac2156939ecb7e6a1e8fa14e53728328c48" +checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" dependencies = [ "lazy_static", "quote", @@ -5891,9 +5918,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.10" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" dependencies = [ "cc", "regex", @@ -5901,8 +5928,8 @@ dependencies = [ [[package]] name = "tree-sitter-c" -version = "0.20.6" -source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=212a80f#212a80f86452bb1316324fa0db730cf52f29e05a" +version = "0.21.3" +source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=00ed08f#00ed08f1a6c18141bfd7a81638e4d239a0bb55cc" dependencies = [ "cc", "tree-sitter", @@ -5910,9 +5937,9 @@ dependencies = [ [[package]] name = "tree-sitter-c-sharp" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ab3dc608f34924fa9e10533a95f62dbc14b6de0ddd7107722eba66fe19ae31" +checksum = "ff899037068a1ffbb891891b7e94db1400ddf12c3d934b85b8c9e30be5cd18da" dependencies = [ "cc", "tree-sitter", @@ -5920,8 +5947,18 @@ dependencies = [ [[package]] name = "tree-sitter-cpp" -version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=a714740#a71474021410973b29bfe99440d57bcd750246b1" +version = "0.22.1" +source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=d29fbff#d29fbff09a8c9ff4f3074de2595dfca12cb33da9" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-elixir" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" dependencies = [ "cc", "tree-sitter", @@ -5929,9 +5966,9 @@ dependencies = [ [[package]] name = "tree-sitter-go" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114" +checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f" dependencies = [ "cc", "tree-sitter", @@ -5939,9 +5976,9 @@ dependencies = [ [[package]] name = "tree-sitter-java" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adc5696bf5abf761081d7457d2bb82d0e3b28964f4214f63fd7e720ef462653" +checksum = "33bc21adf831a773c075d9d00107ab43965e6a6ea7607b47fd9ec6f3db4b481b" dependencies = [ "cc", "tree-sitter", @@ -5949,9 +5986,19 @@ dependencies = [ [[package]] name = "tree-sitter-kotlin" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5f367466210220a194a2d8831fc12d15aa13305e7bcdf2dba47714aa328e86" +checksum = "c88dfbb22333118a5d5c5c10b19f93d115a6fa3c8a69dd0e6a260a64f9f5a79b" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-lua" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9fe6fc87bd480e1943fc1fcb02453fb2da050e4e8ce0daa67d801544046856" dependencies = [ "cc", "tree-sitter", @@ -5959,9 +6006,9 @@ dependencies = [ [[package]] name = "tree-sitter-python" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda114f58048f5059dcf158aff691dffb8e113e6d2b50d94263fd68711975287" +checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" dependencies = [ "cc", "tree-sitter", @@ -5969,9 +6016,9 @@ dependencies = [ [[package]] name = "tree-sitter-ruby" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac30cbb1560363ae76e1ccde543d6d99087421e228cc47afcec004b86bb711a" +checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1" dependencies = [ "cc", "tree-sitter", @@ -5979,9 +6026,9 @@ dependencies = [ [[package]] name = "tree-sitter-rust" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797842733e252dc11ae5d403a18060bf337b822fc2ae5ddfaa6ff4d9cc20bda6" +checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" dependencies = [ "cc", "tree-sitter", @@ -5989,8 +6036,8 @@ dependencies = [ [[package]] name = "tree-sitter-solidity" -version = "0.0.3" -source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=b239a95#b239a95f94cfcc6e7b3e961bc73a28d55e214f02" +version = "1.2.6" +source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=0e86ae647bda22c9bee00ec59752df7b3d3b000b#0e86ae647bda22c9bee00ec59752df7b3d3b000b" dependencies = [ "cc", "tree-sitter", @@ -5998,9 +6045,9 @@ dependencies = [ [[package]] name = "tree-sitter-tags" -version = "0.20.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05" +checksum = "34380416097ab36d1b4cd83f887d9e150ea4feaeb6ee9a5ecfe53d26839acc69" dependencies = [ "memchr", "regex", @@ -6010,9 +6057,9 @@ dependencies = [ [[package]] name = "tree-sitter-typescript" -version = "0.20.3" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75049f0aafabb2aac205d7bb24da162b53dcd0cfb326785f25a2f32efa8071a" +checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4" dependencies = [ "cc", "tree-sitter", @@ -6029,9 +6076,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -6045,7 +6092,7 @@ dependencies = [ "http 1.1.0", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror", "url", @@ -6054,9 +6101,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -6064,17 +6111,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "ulid" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" -dependencies = [ - "getrandom", - "rand", - "web-time", -] - [[package]] name = "unicase" version = "2.7.0" @@ -6086,25 +6122,31 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -6113,9 +6155,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode_categories" @@ -6145,16 +6187,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", "serde", ] [[package]] name = "url-parse" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d375da66174ba9b3697f36468fb6b9a981074537569a87ad2dc43de2a598063" +checksum = "865ece61c15cae30f180636ae551daa25c318c181938da07f3ab3ed06750bdd2" dependencies = [ "regex", ] @@ -6185,9 +6227,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "4.2.0" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" +checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" dependencies = [ "indexmap 2.2.6", "serde", @@ -6197,15 +6239,15 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" +checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -6226,35 +6268,35 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom", - "rand", + "getrandom 0.2.15", + "rand 0.8.5", "serde", "uuid-macro-internal", ] [[package]] name = "uuid-macro-internal" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e" +checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "validator" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ - "idna 0.4.0", - "lazy_static", + "idna", + "once_cell", "regex", "serde", "serde_derive", @@ -6265,28 +6307,16 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" dependencies = [ - "if_chain", - "lazy_static", + "darling 0.20.9", + "once_cell", "proc-macro-error", "proc-macro2", "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -6295,6 +6325,18 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-trait" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa 1.0.11", + "ryu", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -6303,11 +6345,12 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.2.4" +version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", + "cfg-if", "rustversion", "time", ] @@ -6336,14 +6379,19 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6351,10 +6399,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.87" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6362,24 +6416,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6389,9 +6443,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6399,22 +6453,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -6431,19 +6485,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6451,15 +6495,34 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] [[package]] name = "winapi" @@ -6479,11 +6542,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -6498,31 +6561,26 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-core", + "windows-targets 0.52.5", ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.5", ] [[package]] @@ -6531,142 +6589,148 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winreg" version = "0.52.0" @@ -6678,61 +6742,59 @@ dependencies = [ ] [[package]] -name = "wrapcenum-derive" -version = "0.4.0" +name = "winsafe" +version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "wrapcenum-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" dependencies = [ - "darling 0.10.2", + "darling 0.20.9", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "xml5ever" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "7c376f76ed09df711203e20c3ef5ce556f0166fa03d39590016c0fd625437fad" dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yarn-lock-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0603904f8482a1a2a038c9f89c75b0e435392513c3abd3d284123381bbe51f" -dependencies = [ - "nom", - "thiserror", + "log", + "mac", + "markup5ever 0.12.1", ] [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" @@ -6748,30 +6810,28 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix index df01b5c494..03179482b4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix @@ -1,28 +1,29 @@ -{ config -, lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, stdenv +{ + config, + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + stdenv, -, git -, openssl -, pkg-config -, protobuf + git, + openssl, + pkg-config, + protobuf, -, llama-cpp + llama-cpp, -, autoAddDriverRunpath -, cudaSupport ? config.cudaSupport -, cudaPackages ? { } + autoAddDriverRunpath, + cudaSupport ? config.cudaSupport, -, rocmSupport ? config.rocmSupport + rocmSupport ? config.rocmSupport, -, darwin -, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + darwin, + metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, # one of [ null "cpu" "rocm" "cuda" "metal" ]; -, acceleration ? null + acceleration ? null, + versionCheckHook, }: let @@ -32,8 +33,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.11.1"; - + version = "0.18.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -41,32 +41,49 @@ let (optional metalSupport "metal") ]; - warnIfMultipleAccelerationMethods = configured: (let - len = builtins.length configured; - result = if len == 0 then "cpu" else (builtins.head configured); - in - lib.warnIf (len > 1) '' - building tabby with multiple acceleration methods enabled is not - supported; falling back to `${result}` - '' - result - ); + warnIfMultipleAccelerationMethods = + configured: + ( + let + len = builtins.length configured; + result = if len == 0 then "cpu" else (builtins.head configured); + in + lib.warnIf (len > 1) '' + building tabby with multiple acceleration methods enabled is not + supported; falling back to `${result}` + '' result + ); # If user did not not override the acceleration attribute, then try to use one of # - nixpkgs.config.cudaSupport # - nixpkgs.config.rocmSupport # - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # !! warn if multiple acceleration methods are enabled and default to the first one in the list - featureDevice = if (builtins.isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration; + featureDevice = + if (builtins.isNull acceleration) then + (warnIfMultipleAccelerationMethods availableAccelerations) + else + acceleration; - warnIfNotLinux = api: (lib.warnIfNot stdenv.hostPlatform.isLinux - "building tabby with `${api}` is only supported on linux; falling back to cpu" - stdenv.hostPlatform.isLinux); - warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" - (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)); + warnIfNotLinux = + api: + (lib.warnIfNot stdenv.hostPlatform.isLinux + "building tabby with `${api}` is only supported on linux; falling back to cpu" + stdenv.hostPlatform.isLinux + ); + warnIfNotDarwinAarch64 = + api: + (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" + (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + ); - validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ "cpu" "rocm" "cuda" "metal" ]; + validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ + "cpu" + "rocm" + "cuda" + "metal" + ]; # TODO(ghthor): there is a bug here where featureDevice could be cuda, but enableCuda is false # The would result in a startup failure of the service module. @@ -87,14 +104,21 @@ let }; # TODO(ghthor): some of this can be removed - darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals enableMetal [ Metal MetalKit ]); + darwinBuildInputs = + [ llamaccpPackage ] + ++ optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Foundation + Accelerate + CoreVideo + CoreGraphics + ] + ++ optionals enableMetal [ + Metal + MetalKit + ] + ); cudaBuildInputs = [ llamaccpPackage ]; rocmBuildInputs = [ llamaccpPackage ]; @@ -107,55 +131,85 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; - rev = "v${version}"; - hash = "sha256-OgAE526aW3mVqf6fVmBmL5/B4gH9B54QLEITQk9Kgsg="; + rev = "refs/tags/v${version}"; + hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "apalis-0.5.1" = "sha256-hGvVuSy32lSTR5DJdiyf8q1sXbIeuLSGrtyq6m2QlUQ="; - "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; - "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; - "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; + "ollama-rs-0.1.9" = "sha256-d6sKUxc8VQbRkVqMOeNFqDdKesq5k32AQShK67y2ssg="; + "oneshot-0.1.6" = "sha256-PmYuHuNTqToMyMHPRFDUaHUvFkVftx9ZCOBwXj+4Hc4="; + "ownedbytes-0.7.0" = "sha256-p0+ohtW0VLmfDTZw/LfwX2gYfuYuoOBcE+JsguK7Wn8="; + "sqlx-0.7.4" = "sha256-tcISzoSfOZ0jjNgGpuPPxjMxmBUPw/5FVDoALZEAHKY="; + "tree-sitter-c-0.21.3" = "sha256-ucbHLS2xyGo1uyKZv/K1HNXuMo4GpTY327cgdVS9F3c="; + "tree-sitter-cpp-0.22.1" = "sha256-3akSuQltFMF6I32HwRU08+Hcl9ojxPGk2ZuOX3gAObw="; + "tree-sitter-solidity-1.2.6" = "sha256-S00hdzMoIccPYBEvE092/RIMnG8YEnDGk6GJhXlr4ng="; }; }; # https://github.com/TabbyML/tabby/blob/v0.7.0/.github/workflows/release.yml#L39 - cargoBuildFlags = [ - "--release" - "--package" "tabby" - ] ++ optionals enableRocm [ - "--features" "rocm" - ] ++ optionals enableCuda [ - "--features" "cuda" + cargoBuildFlags = + [ + # Don't need to build llama-cpp-server (included in default build) + "--no-default-features" + "--features" + "ee" + "--package" + "tabby" + ] + ++ optionals enableRocm [ + "--features" + "rocm" + ] + ++ optionals enableCuda [ + "--features" + "cuda" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; - OPENSSL_NO_VENDOR = 1; + nativeBuildInputs = + [ + git + pkg-config + protobuf + ] + ++ optionals enableCuda [ + autoAddDriverRunpath + ]; - nativeBuildInputs = [ - pkg-config - protobuf - git - ] ++ optionals enableCuda [ - autoAddDriverRunpath - ]; + buildInputs = + [ openssl ] + ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs + ++ optionals enableCuda cudaBuildInputs + ++ optionals enableRocm rocmBuildInputs; - buildInputs = [ openssl ] - ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs - ++ optionals enableCuda cudaBuildInputs - ++ optionals enableRocm rocmBuildInputs - ; + postInstall = '' + # NOTE: Project contains a subproject for building llama-server + # But, we already have a derivation for this + ln -s ${lib.getExe' llama-cpp "llama-server"} $out/bin/llama-server + ''; - env.LLAMA_CPP_LIB = "${lib.getLib llamaccpPackage}/lib"; - patches = [ ./0001-nix-build-use-nix-native-llama-cpp-package.patch ]; + env = { + OPENSSL_NO_VENDOR = 1; + }; # Fails with: # file cannot create directory: /var/empty/local/lib64/cmake/Llama doCheck = false; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; meta = with lib; { homepage = "https://github.com/TabbyML/tabby"; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailscale/package.nix similarity index 95% rename from third_party/nixpkgs/pkgs/servers/tailscale/default.nix rename to third_party/nixpkgs/pkgs/by-name/ta/tailscale/package.nix index c01b029142..5e1b6a9bab 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tailscale/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoModule +, buildGo123Module , fetchFromGitHub , fetchpatch , makeWrapper @@ -15,9 +15,9 @@ }: let - version = "1.76.0"; + version = "1.76.1"; in -buildGoModule { +buildGo123Module { pname = "tailscale"; inherit version; @@ -27,7 +27,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-fCUrZ+rrNJ9+XYjCtgaTUWmWczBbavtPe1pFM3L913w="; + hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix index fac4947858..cdd30749f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-7az1wJ6BK9nPKirtW/fmXo3013JCPf+TNk/aG/mGTfo="; + hash = "sha256-+RxTTm5t0/0hLKxhWILzb0qf6aZzbOZJYJenRpX8UdA="; }; buildInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taterclient-ddnet/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taterclient-ddnet/package.nix new file mode 100644 index 0000000000..95799e7b64 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -0,0 +1,136 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cargo, + cmake, + ninja, + pkg-config, + rustPlatform, + rustc, + curl, + freetype, + libGLU, + libnotify, + libogg, + libX11, + opusfile, + pcre, + python3, + SDL2, + sqlite, + wavpack, + ffmpeg, + x264, + vulkan-headers, + vulkan-loader, + glslang, + spirv-tools, + gtest, + darwin, +}: +let + clientExecutable = "TaterClient-DDNet"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "taterclient-ddnet"; + version = "8.6.0"; + + src = fetchFromGitHub { + owner = "sjrc6"; + repo = "taterclient-ddnet"; + rev = finalAttrs.version; + hash = "sha256-IfTQRMC2wcEH+KhlADHVIhfavlTN4mfTtlN5+/KojA0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname src version; + hash = "sha256-L6NsLC5hg4/MlTfnOITBNoPIoKxlDx5BwXWnV7W4uT0="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + rustc + cargo + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ gtest ]; + + buildInputs = + [ + curl + libnotify + pcre + python3 + sqlite + freetype + libGLU + libogg + opusfile + SDL2 + wavpack + ffmpeg + x264 + vulkan-loader + vulkan-headers + glslang + spirv-tools + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Carbon + Cocoa + OpenGL + Security + ] + ); + + postPatch = '' + substituteInPlace src/engine/shared/storage.cpp \ + --replace-fail /usr/ $out/ + ''; + + cmakeFlags = [ + "-DAUTOUPDATE=OFF" + "-DCLIENT=ON" + "-DSERVER=OFF" + "-DTOOLS=OFF" + "-DCLIENT_EXECUTABLE=${clientExecutable}" + ]; + + # Tests loop forever on Darwin for some reason + doCheck = !stdenv.hostPlatform.isDarwin; + checkTarget = "run_tests"; + + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Upstream links against /lib while it installs this library in /lib/ddnet + install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/${clientExecutable}" + ''; + + postInstall = '' + # Desktop application conflicts with the ddnet package + mv "$out/share/applications/ddnet.desktop" "$out/share/applications/taterclient-ddnet.desktop" + + substituteInPlace $out/share/applications/taterclient-ddnet.desktop \ + --replace-fail "Exec=DDNet" "Exec=${clientExecutable}" \ + --replace-fail "Name=DDNet" "Name=TaterClient (DDNet)" \ + --replace-fail "Comment=Launch DDNet" "Comment=Launch ${clientExecutable}" + ''; + + meta = { + description = "Modification of DDNet teeworlds client"; + homepage = "https://github.com/sjrc6/taterclient-ddnet"; + changelog = "https://github.com/sjrc6/taterclient-ddnet/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + melon + theobori + ]; + mainProgram = clientExecutable; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/td/tdf/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/td/tdf/Cargo.lock index 4b9426c379..7b9328f645 100644 --- a/third_party/nixpkgs/pkgs/by-name/td/tdf/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/td/tdf/Cargo.lock @@ -1,32 +1,29 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] -name = "ahash" -version = "0.8.11" +name = "aho-corasick" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", + "memchr", ] [[package]] @@ -36,26 +33,136 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] -name = "autocfg" -version = "1.3.0" +name = "anes" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "axum" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower 0.5.1", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -70,15 +177,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -87,23 +200,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "cairo-rs" -version = "0.19.4" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "cairo-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", @@ -117,25 +241,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] -name = "castaway" -version = "0.2.2" +name = "cast" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" dependencies = [ "rustversion", ] -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - [[package]] name = "cfg-expr" -version = "0.15.8" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" dependencies = [ "smallvec", "target-lexicon", @@ -148,18 +272,121 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "compact_str" -version = "0.7.1" +name = "ciborium" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" dependencies = [ "castaway", "cfg-if", "itoa", + "rustversion", "ryu", "static_assertions", ] +[[package]] +name = "console-api" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "hyper-util", + "prost", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "cpuprofiler" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f8479dbcfd2bbaa0c0c26779b913052b375981cdf533091f2127ea3d42e52b" +dependencies = [ + "error-chain", + "lazy_static", + "pkg-config", +] + [[package]] name = "crc32fast" version = "1.4.2" @@ -169,6 +396,44 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -205,16 +470,16 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossterm_winapi", "futures-core", - "libc", - "mio", + "mio 1.0.2", "parking_lot", + "rustix", "signal-hook", "signal-hook-mio", "winapi", @@ -229,6 +494,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "dyn-clone" version = "1.0.17" @@ -237,9 +508,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "equivalent" @@ -258,36 +529,69 @@ dependencies = [ ] [[package]] -name = "fdeflate" -version = "0.3.4" +name = "error-chain" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "backtrace", + "version_check", +] + +[[package]] +name = "fdeflate" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -298,25 +602,40 @@ dependencies = [ ] [[package]] -name = "futures-channel" -version = "0.3.30" +name = "futures" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -325,15 +644,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -341,19 +660,26 @@ dependencies = [ ] [[package]] -name = "futures-task" -version = "0.3.30" +name = "futures-sink" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", "futures-macro", + "futures-sink", "futures-task", "pin-project-lite", "pin-utils", @@ -373,15 +699,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" -version = "0.19.5" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c" dependencies = [ "futures-channel", "futures-core", @@ -392,14 +718,13 @@ dependencies = [ "libc", "pin-project-lite", "smallvec", - "thiserror", ] [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779" dependencies = [ "glib-sys", "gobject-sys", @@ -410,11 +735,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.7" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -427,16 +752,15 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", ] [[package]] name = "glib-macros" -version = "0.19.7" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate", "proc-macro2", "quote", @@ -445,9 +769,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b" dependencies = [ "libc", "system-deps", @@ -455,9 +779,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" dependencies = [ "glib-sys", "libc", @@ -465,20 +789,63 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.14.5" +name = "h2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ - "ahash", - "allocator-api2", + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "heck" -version = "0.4.1" +name = "half" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64 0.21.7", + "byteorder", + "flate2", + "nom", + "num-traits", +] [[package]] name = "heck" @@ -492,6 +859,117 @@ 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 = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "icy_sixel" version = "0.1.2" @@ -500,12 +978,12 @@ checksum = "86858ae800284d596cfdefcb0ad435c3493c12f35367431bbe9b2b3858c1155b" [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", "png", "rayon", @@ -515,14 +993,30 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "inotify" version = "0.9.6" @@ -544,10 +1038,31 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.12.1" +name = "instability" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -567,6 +1082,15 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "kqueue" version = "1.0.8" @@ -588,10 +1112,27 @@ dependencies = [ ] [[package]] -name = "libc" -version = "0.2.155" +name = "lazy_static" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall", +] [[package]] name = "linux-raw-sys" @@ -611,32 +1152,59 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown", + "hashbrown 0.15.0", ] [[package]] -name = "memchr" -version = "2.7.2" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", "simd-adler32", ] @@ -652,13 +1220,36 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "notify" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -666,7 +1257,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -680,30 +1271,26 @@ 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", - "libc", -] - [[package]] name = "object" -version = "0.35.0" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "parking_lot" @@ -723,9 +1310,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -734,6 +1321,32 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -748,15 +1361,43 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -767,9 +1408,9 @@ dependencies = [ [[package]] name = "poppler-rs" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9421853a6cc8dfaea2e31bd751fb037abdc3a727f04d0eb10fcf7061f6eff562" +checksum = "45b1f21ffe55c78cbe3b301950cf15a143c8ff2a0f05a2b9e8e9c80605347206" dependencies = [ "cairo-rs", "gio", @@ -780,9 +1421,9 @@ dependencies = [ [[package]] name = "poppler-sys-rs" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6737da38a7bb0126931c4a7b23b7bea517410bd48676f18af6b38c5f88d51" +checksum = "e970afd57f25a79b8e526c257bf9c8cd5a6a68973331b6da341c422a6db47755" dependencies = [ "cairo-sys-rs", "gio-sys", @@ -794,33 +1435,68 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] [[package]] -name = "quote" -version = "1.0.36" +name = "prost" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" +dependencies = [ + "prost", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -857,17 +1533,18 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.3" -source = "git+https://github.com/itsjunetime/ratatui.git#0e185042b728b3bc8baff245154e6d200bb64f3b" +version = "0.28.1" +source = "git+https://github.com/itsjunetime/ratatui.git#a3fd887eaafa13faf88f28b27df94a5eb6051933" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cassowary", "compact_str", "crossterm", + "indoc", + "instability", "itertools 0.13.0", "lru", "paste", - "stability", "strum", "unicode-segmentation", "unicode-truncate", @@ -876,10 +1553,10 @@ dependencies = [ [[package]] name = "ratatui-image" -version = "1.0.0" -source = "git+https://github.com/itsjunetime/ratatui-image.git?branch=vb64_on_personal#e5c13ed29c9decdff093c2be5d673d84fb3589a9" +version = "2.0.1" +source = "git+https://github.com/itsjunetime/ratatui-image.git?branch=vb64_on_personal#5a11b825425932c6553abe967206e0bf76256f79" dependencies = [ - "base64", + "base64 0.22.1", "dyn-clone", "icy_sixel", "image", @@ -911,22 +1588,57 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] -name = "redox_syscall" -version = "0.5.1" +name = "regex" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ - "bitflags 2.5.0", + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -935,11 +1647,11 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -975,18 +1687,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -994,14 +1706,35 @@ dependencies = [ ] [[package]] -name = "serde_spanned" -version = "0.6.6" +name = "serde_json" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "signal-hook" version = "0.3.17" @@ -1014,12 +1747,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 1.0.2", "signal-hook", ] @@ -1054,13 +1787,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] -name = "stability" -version = "0.2.0" +name = "socket2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ - "quote", - "syn", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", ] [[package]] @@ -1071,20 +1813,20 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", @@ -1093,9 +1835,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -1103,13 +1845,25 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.2.2" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "system-deps" +version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" dependencies = [ "cfg-expr", - "heck 0.5.0", + "heck", "pkg-config", "toml", "version-compare", @@ -1117,16 +1871,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tdf" version = "0.1.0" dependencies = [ "cairo-rs", + "console-subscriber", + "cpuprofiler", + "criterion", "crossterm", + "flume", "futures-util", "glib", "image", @@ -1139,42 +1897,47 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.61" +name = "thread_local" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "thiserror-impl", + "cfg-if", + "once_cell", ] [[package]] -name = "thiserror-impl" -version = "1.0.61" +name = "tinytemplate" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ - "proc-macro2", - "quote", - "syn", + "serde", + "serde_json", ] [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "num_cpus", + "bytes", + "libc", + "mio 1.0.2", "pin-project-lite", + "socket2", "tokio-macros", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -1182,82 +1945,231 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.8.13" +name = "tokio-stream" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" -dependencies = [ - "indexmap", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.9", + "winnow", ] [[package]] -name = "unicode-ident" -version = "1.0.12" +name = "tonic" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "tracing", + "tracing-core", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-truncate" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" dependencies = [ - "itertools 0.12.1", + "itertools 0.13.0", + "unicode-segmentation", "unicode-width", ] [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vb64" version = "0.1.2" -source = "git+https://github.com/lukaslihotzki/vb64?branch=update#01e791186f57982511a3bcfb0d2316010c1adef0" +source = "git+https://github.com/lukaslihotzki/vb64?rev=f48cf02c06a29a48ddf9efa684bdc904b3b5370d#f48cf02c06a29a48ddf9efa684bdc904b3b5370d" [[package]] name = "version-compare" @@ -1267,9 +2179,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -1281,12 +2193,86 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1305,11 +2291,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1333,7 +2319,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -1353,18 +2348,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -1375,9 +2370,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -1387,9 +2382,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -1399,15 +2394,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -1417,9 +2412,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -1429,9 +2424,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -1441,9 +2436,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -1453,42 +2448,34 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -1503,9 +2490,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/third_party/nixpkgs/pkgs/by-name/td/tdf/package.nix b/third_party/nixpkgs/pkgs/by-name/td/tdf/package.nix index 5d5a39058c..97f61c2022 100644 --- a/third_party/nixpkgs/pkgs/by-name/td/tdf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/td/tdf/package.nix @@ -10,22 +10,22 @@ rustPlatform.buildRustPackage { pname = "tdf"; - version = "0-unstable-2024-05-29"; + version = "0-unstable-2024-10-09"; src = fetchFromGitHub { owner = "itsjunetime"; repo = "tdf"; fetchSubmodules = true; - rev = "017596a8b0745a6da7c3c75a5f55073b82202a5c"; - hash = "sha256-H0xdDvWDSkvIy4vFWKiVFP03CogswIZMQ393BeEy2BQ="; + rev = "f6d339923bc71d3f637f24bf0c6eef6dacb61bf9"; + hash = "sha256-C1S5u1EsOYvUE1CqreeBg7Z5Oj+mzCf0zPdZBz0LNLw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ratatui-0.26.3" = "sha256-lRQQJqt9UKZ2OzvrNzq/FqDvU6CgPPDAB2QDB7TR1V4="; - "ratatui-image-1.0.0" = "sha256-0lrFmXPljKKNIbLNhQsuCv7HhJOJ234HSfUPj4XSeXY="; - "vb64-0.1.2" = "sha256-VvObgaJhHNah3exVQInFa5mhHjzEg0MaFqQdnCE5Pp8="; + "ratatui-0.28.1" = "sha256-riVdXpHW5J1f4YY2A32YLpwydxn/kJ1cHRdm7CCdoN8="; + "ratatui-image-2.0.1" = "sha256-ZFd7ABeyuO270vWEZEE685Bil6sq3RndqoD7TSU8qmU="; + "vb64-0.1.2" = "sha256-Ypb59Rtn0ZkP6fwqIqOEeiNLcmzB368CkViIVCxpCI8="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix b/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix index d49899480e..ae5cccf290 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix @@ -8,13 +8,13 @@ let technitium-library = buildDotnetModule rec { pname = "TechnitiumLibrary"; - version = "5af89bb453dd67ae3119771597451e438a938591"; + version = "13.0.2"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; - rev = version; - hash = "sha256-ezYC2Nh5lgaN95OEP4TYcH6+3AbHbyTfv1RU19DXI3c="; + rev = "refs/tags/dns-server-v${version}"; + hash = "sha256-mMNZZvM/UvQTiyeOgPHXXFxmsiGPe4Jal1aSEMEM5Xc="; name = "${pname}-${version}"; }; @@ -30,13 +30,13 @@ let in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.0.1"; + version = "13.0.2"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-O5QJAo6GjoKes5W4ajMcsYpR3j7EcR1vVMiKtTLcwDE="; + hash = "sha256-2dFjr3f4ZlLBJzuObSYIkSdtcyZ8dC6M7/S1p7WoG0c="; name = "${pname}-${version}"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/te/termineter/package.nix b/third_party/nixpkgs/pkgs/by-name/te/termineter/package.nix new file mode 100644 index 0000000000..6de9c903cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/te/termineter/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "termineter"; + version = "1.0.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rsmusllp"; + repo = "termineter"; + rev = "refs/tags/v${version}"; + hash = "sha256-sJN1FNUCpQUMJNM6F2+v0NmGqu4LVYcsffwzl3Hr1CU="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + crcelk + pluginbase + pyasn1 + pyserial + smoke-zephyr + tabulate + termcolor + ]; + + pythonImportsCheck = [ "termineter" ]; + + meta = { + description = "Smart Meter Security Testing Framework"; + homepage = "https://github.com/rsmusllp/termineter"; + changelog = "https://github.com/rsmusllp/termineter/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "termineter"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/te/tex-fmt/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tex-fmt/package.nix index 2a13821d72..cad53fe145 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tex-fmt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tex-fmt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; rev = "refs/tags/v${version}"; - hash = "sha256-o8TlD0qxz/0sS45tnBNXYNDzp+VAhH3Ym1odSleD/uw="; + hash = "sha256-Ii/z9ZmsWCHxxqUbkcu7HRBuN2LiLCxzUvqRexwQ/Co="; }; - cargoHash = "sha256-N3kCeBisjeOAG45QPQhplGRAvj5kebEX4U9pisM/GUQ="; + cargoHash = "sha256-2vPxsXKInH18h/AoOWfl0VteUBmxWDzZa6AtpKfY5Hs="; meta = { description = "LaTeX formatter written in Rust"; diff --git a/third_party/nixpkgs/pkgs/by-name/th/thrift-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/th/thrift-ls/package.nix index 9eba51c0b6..9a93061b77 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/thrift-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/thrift-ls/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "thrift-ls"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "joyme123"; repo = "thrift-ls"; rev = "v${version}"; - hash = "sha256-ywrb1pOpqHnVhb9MA2cgkF5croA9iqtvLxvVmeloOpE="; + hash = "sha256-hZpzez3xNnN76OcIzEswPbvw6QTU51Jnrry3AWCtbFk="; }; vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock index 27b544bcf0..1c28fc5224 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -136,9 +130,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "approx" @@ -184,13 +178,13 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -201,9 +195,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "az" @@ -220,7 +214,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -246,7 +240,20 @@ checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" dependencies = [ "numerals", "paste", - "strum 0.26.3", + "strum", + "unicode-normalization", + "unscanny", +] + +[[package]] +name = "biblatex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35a7317fcbdbef94b60d0dd0a658711a936accfce4a631fea4bf8e527eff3c2" +dependencies = [ + "numerals", + "paste", + "strum", "unicode-normalization", "unscanny", ] @@ -357,9 +364,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -367,6 +374,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.7.2" @@ -407,9 +420,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.21" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "shlex", ] @@ -482,19 +495,19 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" +checksum = "92fea693c83bd967604be367dc1e1b4895625eabafec2eec66c51092e18e700e" dependencies = [ - "quick-xml 0.31.0", + "quick-xml 0.36.2", "serde", ] [[package]] name = "clap" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -502,9 +515,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -512,14 +525,14 @@ dependencies = [ "strsim", "terminal_size", "unicase", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] name = "clap_complete" -version = "4.5.29" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" dependencies = [ "clap", ] @@ -536,9 +549,9 @@ dependencies = [ [[package]] name = "clap_complete_nushell" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" +checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677" dependencies = [ "clap", "clap_complete", @@ -550,10 +563,10 @@ version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -564,9 +577,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clap_mangen" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" +checksum = "fbae9cbfdc5d4fa8711c09bd7b83f644cb48281ac35bf97af3e47b0675864bdf" dependencies = [ "clap", "roff", @@ -585,7 +598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -630,7 +643,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -641,7 +654,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -800,7 +813,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -811,7 +824,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -925,7 +938,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1017,7 +1030,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1083,9 +1096,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -1104,12 +1117,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1130,21 +1143,21 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.20.0", + "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", "memmap2", "slotmap", "tinyvec", - "ttf-parser", + "ttf-parser 0.24.1", ] [[package]] @@ -1188,9 +1201,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1203,9 +1216,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1213,15 +1226,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1230,38 +1243,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1305,16 +1318,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.13.1" @@ -1327,9 +1330,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "globmatch" @@ -1367,7 +1370,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1386,7 +1389,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1422,6 +1425,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hashlink" version = "0.8.4" @@ -1433,14 +1442,14 @@ dependencies = [ [[package]] name = "hayagriva" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" +checksum = "7a3635c2577f77499c9dc3dceeef2e64e6c146e711b1861507a0f15b20641348" dependencies = [ - "biblatex", + "biblatex 0.10.0", "ciborium", "citationberg", - "indexmap 2.5.0", + "indexmap 2.6.0", "numerals", "paste", "serde", @@ -1452,12 +1461,6 @@ dependencies = [ "url", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1540,9 +1543,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1558,9 +1561,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -1582,9 +1585,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1609,10 +1612,28 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.30", - "rustls", + "hyper 0.14.31", + "rustls 0.21.12", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.5.0", + "hyper-util", + "rustls 0.23.15", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", + "webpki-roots 0.26.6", ] [[package]] @@ -1622,12 +1643,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.5.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-tungstenite" version = "0.14.0" @@ -1635,7 +1672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69ce21dae6ce6e5f336a444d846e592faf42c5c28f70a5c8ff67893cbcb304d3" dependencies = [ "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "pin-project-lite", "tokio", @@ -1645,17 +1682,21 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", + "socket2", "tokio", + "tower-service", + "tracing", ] [[package]] @@ -1809,7 +1850,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1859,24 +1900,35 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "image" -version = "0.24.9" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", - "gif 0.13.1", - "jpeg-decoder", + "gif", "num-traits", "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", ] [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "indexmap" @@ -1891,12 +1943,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -1951,9 +2003,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-docker" @@ -2015,17 +2067,11 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -2061,11 +2107,12 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" dependencies = [ "arrayvec 0.7.6", + "smallvec", ] [[package]] @@ -2076,9 +2123,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libm" @@ -2200,16 +2247,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2217,6 +2254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2249,6 +2287,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "mutate_once" version = "0.1.1" @@ -2313,6 +2357,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -2348,18 +2403,18 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "open" @@ -2374,9 +2429,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2395,7 +2450,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2406,9 +2461,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2443,7 +2498,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2483,17 +2538,17 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pdf-writer" -version = "0.9.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e9127455063c816e661caac9ecd9043ad2871f55be93014e6838a8ced2332b" +checksum = "be17f48d7fbbd22c6efedb58af5d409aa578e407f40b29a0bcb4e66ed84c5c98" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "itoa", "memchr", "ryu", @@ -2535,7 +2590,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2567,18 +2622,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixglyph" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e0f8ad4c197db38125b880c3c44544788665c7d5f4c42f5a35da44bca1a712" +checksum = "d15afa937836bf3d876f5a04ce28810c06045857bf46c3d0d31073b8aada5494" dependencies = [ - "ttf-parser", + "ttf-parser 0.24.1", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plist" @@ -2587,7 +2642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.5.0", + "indexmap 2.6.0", "quick-xml 0.32.0", "serde", "time", @@ -2595,22 +2650,22 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] name = "portable-atomic" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "postcard" @@ -2647,7 +2702,7 @@ checksum = "b55c4d17d994b637e2f4daf6e5dc5d660d209d5642377d675d7a1c3ab69fa579" dependencies = [ "arrayvec 0.5.2", "typed-arena", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2661,14 +2716,14 @@ dependencies = [ "is-terminal", "lazy_static", "term", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -2709,14 +2764,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", - "serde", -] +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" @@ -2727,6 +2778,64 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.15", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls 0.23.15", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.37" @@ -2794,9 +2903,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -2814,9 +2923,9 @@ dependencies = [ [[package]] name = "reflexo" -version = "0.5.0-rc7" +version = "0.5.0-rc8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2803fc3e89d63fe9b5201726f5c4490a3d4d415facdad9581082a5e7e647db52" +checksum = "2e46b3df333677fdc209d25c4c53d33abf570f06d5ec1d46ef85f041ab5f42ed" dependencies = [ "base64 0.22.1", "bitvec", @@ -2827,6 +2936,7 @@ dependencies = [ "instant", "parking_lot", "path-clean", + "reflexo-typst-shim", "rkyv", "rustc-hash 2.0.0", "serde", @@ -2839,16 +2949,16 @@ dependencies = [ [[package]] name = "reflexo-typst" -version = "0.5.0-rc7" +version = "0.5.0-rc8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac7cb43d90c023f5cbeedfb24b2022c550b1e29952fc0014bac947bf69d6647" +checksum = "7c1accc0267ce7e1708f3b452059cd3f90396193223d130ab6899e43fa88d0d3" dependencies = [ "codespan-reporting", "comemo 0.4.0", "ecow 0.2.2", "futures", "fxhash", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "nohash-hasher", "notify", @@ -2867,10 +2977,21 @@ dependencies = [ ] [[package]] -name = "reflexo-typst2vec" -version = "0.5.0-rc7" +name = "reflexo-typst-shim" +version = "0.5.0-rc8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104405c4eb839fecea0c88443961d1f10c7f533c13083d1b8355d83f01b1bbd1" +checksum = "c138a20a18d48161beeb7f1f703c30af5b07c192a9f0914675f1b579c13e7de2" +dependencies = [ + "cfg-if", + "typst", + "typst-syntax 0.12.0", +] + +[[package]] +name = "reflexo-typst2vec" +version = "0.5.0-rc8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59de0c19d0d1e13e46f8f186e411e1cf12ab1ab8bca1d3b2231155ed3c8c1b6a" dependencies = [ "bitvec", "comemo 0.4.0", @@ -2887,16 +3008,16 @@ dependencies = [ "svgtypes", "tiny-skia", "tiny-skia-path", - "ttf-parser", + "ttf-parser 0.24.1", "typst", "xmlparser", ] [[package]] name = "reflexo-vec2svg" -version = "0.5.0-rc7" +version = "0.5.0-rc8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e79d065724764ff3c5cb9a6203eede0472290b8b387b2df55f6740618661d59" +checksum = "acb8f0e83ff959d8ab67d58b31396c20b610faa3cd38bcc1fbb9579d4fdc23d5" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -2908,11 +3029,11 @@ dependencies = [ [[package]] name = "reflexo-vfs" -version = "0.5.0-rc7" +version = "0.5.0-rc8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea592d6cfc00420d0719170a6c0dd71580b1cea6682a5f543b3b683991ec3f6" +checksum = "557b6d73fd5e7d73e13c26b1aeeea751d066732aeb2550e7314202c7d100a8a6" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "nohash-hasher", "parking_lot", @@ -2923,9 +3044,9 @@ dependencies = [ [[package]] name = "reflexo-world" -version = "0.5.0-rc7" +version = "0.5.0-rc8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec0d950f4a5087dcbf875b686dd4b67d82c436c10895f98bb5cc027b1aea9e2" +checksum = "24b4825797df0a53f2f58cdf0919f8c1359a6a68a428e47c6c46edb0a001137d" dependencies = [ "chrono", "codespan-reporting", @@ -2938,22 +3059,23 @@ dependencies = [ "log", "parking_lot", "reflexo", + "reflexo-typst-shim", "reflexo-vfs", - "reqwest", + "reqwest 0.12.8", "serde", "serde_json", "serde_with", "sha2", - "strum 0.25.0", + "strum", "tar", "typst", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -2963,9 +3085,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -2974,9 +3096,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" @@ -3001,9 +3123,9 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", - "hyper-rustls", - "hyper-tls", + "hyper 0.14.31", + "hyper-rustls 0.24.2", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -3013,40 +3135,87 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg", ] [[package]] -name = "resvg" -version = "0.38.0" +name = "reqwest" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ - "gif 0.12.0", - "jpeg-decoder", + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.0", + "hyper-rustls 0.27.3", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.15", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.26.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.6", + "windows-registry", +] + +[[package]] +name = "resvg" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" +dependencies = [ + "gif", + "image-webp", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] @@ -3108,12 +3277,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - [[package]] name = "roxmltree" version = "0.20.0" @@ -3129,6 +3292,16 @@ dependencies = [ "archery", ] +[[package]] +name = "rust_decimal" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +dependencies = [ + "arrayvec 0.7.6", + "num-traits", +] + [[package]] name = "rust_iso3166" version = "0.1.13" @@ -3200,10 +3373,24 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -3213,6 +3400,21 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -3224,21 +3426,34 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.17" +name = "rustls-webpki" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", - "ttf-parser", + "ttf-parser 0.24.1", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -3262,9 +3477,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -3340,14 +3555,14 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3" dependencies = [ "itoa", "memchr", @@ -3363,14 +3578,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3389,15 +3604,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -3407,14 +3622,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3423,7 +3638,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -3475,9 +3690,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" @@ -3574,41 +3789,30 @@ dependencies = [ "float-cmp", ] +[[package]] +name = "string-interner" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "serde", +] + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", -] - [[package]] name = "strum" version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros 0.26.4", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.77", + "strum_macros", ] [[package]] @@ -3617,42 +3821,53 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "subsetter" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" +checksum = "74f98178f34057d4d4de93d68104007c6dea4dfac930204a69ab4622daefa648" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svg2pdf" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" +checksum = "5014c9dadcf318fb7ef8c16438e95abcc9de1ae24d60d5bccc64c55100c50364" dependencies = [ + "fontdb", "image", - "miniz_oxide 0.7.4", + "log", + "miniz_oxide", "once_cell", "pdf-writer", "resvg", + "siphasher 1.0.1", + "subsetter", "tiny-skia", + "ttf-parser 0.24.1", "usvg", ] [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ "kurbo", - "siphasher 0.3.11", + "siphasher 1.0.1", ] [[package]] @@ -3668,9 +3883,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3679,7 +3894,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.32" +version = "0.12.0" dependencies = [ "anyhow", "clap", @@ -3703,6 +3918,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + [[package]] name = "synstructure" version = "0.13.1" @@ -3711,7 +3935,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3765,9 +3989,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -3776,9 +4000,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3809,17 +4033,17 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ "rustix", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "tests" -version = "0.11.32" +version = "0.12.0" dependencies = [ "insta", "lsp-server", @@ -3830,23 +4054,29 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.63" +name = "thin-vec" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3916,7 +4146,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.32" +version = "0.12.0" dependencies = [ "anyhow", "async-trait", @@ -3937,7 +4167,7 @@ dependencies = [ "env_logger", "futures", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-tungstenite", "hyper-util", "itertools 0.13.0", @@ -3956,7 +4186,7 @@ dependencies = [ "serde_json", "serde_yaml", "sync-lsp", - "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tinymist-world", @@ -3982,7 +4212,7 @@ dependencies = [ [[package]] name = "tinymist-analysis" -version = "0.11.32" +version = "0.12.0" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -3994,26 +4224,34 @@ dependencies = [ "toml 0.8.19", "typst", "typst-svg", - "typst-syntax 0.11.1", + "typst-syntax 0.12.0", ] [[package]] name = "tinymist-assets" -version = "0.11.32" +version = "0.12.0" [[package]] name = "tinymist-assets" -version = "0.11.32" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea141357280a85cdacb962dc64b07ae6fa4381df468f6aba1d3dd93483afdc38" +checksum = "c544e9b3366dd82252b8d5641f1ff6ac63535e9efe171db3ef73937ef97fa20a" + +[[package]] +name = "tinymist-derive" +version = "0.12.0" +dependencies = [ + "quote", + "syn 2.0.79", +] [[package]] name = "tinymist-query" -version = "0.11.32" +version = "0.12.0" dependencies = [ "anyhow", "base64 0.22.1", - "biblatex", + "biblatex 0.9.3", "chrono", "comemo 0.4.0", "dashmap", @@ -4023,7 +4261,7 @@ dependencies = [ "hashbrown 0.14.5", "hex", "if_chain", - "indexmap 2.5.0", + "indexmap 2.6.0", "insta", "itertools 0.13.0", "log", @@ -4043,12 +4281,13 @@ dependencies = [ "serde_yaml", "sha2", "siphasher 1.0.1", - "strum 0.26.3", + "strum", "tinymist-analysis", + "tinymist-derive", "tinymist-world", "toml 0.8.19", "triomphe", - "ttf-parser", + "ttf-parser 0.20.0", "typlite", "typst", "typst-assets", @@ -4060,7 +4299,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.32" +version = "0.12.0" dependencies = [ "base64 0.22.1", "log", @@ -4071,7 +4310,7 @@ dependencies = [ [[package]] name = "tinymist-world" -version = "0.11.32" +version = "0.12.0" dependencies = [ "anyhow", "chrono", @@ -4082,11 +4321,13 @@ dependencies = [ "log", "parking_lot", "reflexo-typst", - "reqwest", + "reflexo-typst-shim", + "reqwest 0.11.27", "serde", "serde_json", "tar", - "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typst", "typst-assets", ] @@ -4142,7 +4383,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4161,7 +4402,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.15", + "rustls-pki-types", "tokio", ] @@ -4212,7 +4464,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -4230,7 +4482,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -4239,15 +4491,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.20", ] [[package]] @@ -4275,7 +4527,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4289,9 +4541,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -4305,6 +4557,15 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] + [[package]] name = "tungstenite" version = "0.23.0" @@ -4334,6 +4595,17 @@ dependencies = [ "syntect", ] +[[package]] +name = "two-face" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccd4843ea031c609fe9c16cae00e9657bad8a9f735a3cc2e420955d802b4268" +dependencies = [ + "once_cell", + "serde", + "syntect", +] + [[package]] name = "typed-arena" version = "2.0.2" @@ -4348,7 +4620,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typlite" -version = "0.11.32" +version = "0.12.0" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -4359,7 +4631,7 @@ dependencies = [ "tinymist-world", "typst", "typst-svg", - "typst-syntax 0.11.1", + "typst-syntax 0.12.0", ] [[package]] @@ -4374,16 +4646,19 @@ dependencies = [ [[package]] name = "typst" -version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" dependencies = [ + "arrayvec 0.7.6", "az", "bitflags 2.6.0", + "bumpalo", "chinese-number", "ciborium", "comemo 0.4.0", "csv", "ecow 0.2.2", + "flate2", "fontdb", "hayagriva", "hypher", @@ -4394,7 +4669,7 @@ dependencies = [ "icu_segmenter", "if_chain", "image", - "indexmap 2.5.0", + "indexmap 2.6.0", "kamadak-exif", "kurbo", "lipsum", @@ -4407,7 +4682,8 @@ dependencies = [ "qcms", "rayon", "regex", - "roxmltree 0.19.0", + "roxmltree", + "rust_decimal", "rustybuzz", "serde", "serde_json", @@ -4418,19 +4694,22 @@ dependencies = [ "syntect", "time", "toml 0.8.19", - "ttf-parser", - "two-face", + "ttf-parser 0.24.1", + "two-face 0.4.0", "typed-arena", "typst-assets", "typst-macros", - "typst-syntax 0.11.1", + "typst-syntax 0.12.0", "typst-timing", + "typst-utils", "unicode-bidi", "unicode-math-class", "unicode-script", "unicode-segmentation", + "unscanny", "usvg", "wasmi", + "xmlwriter", ] [[package]] @@ -4444,68 +4723,70 @@ dependencies = [ "syntect", "termcolor", "thiserror", - "two-face", + "two-face 0.3.0", "typst-syntax 0.11.1", ] [[package]] name = "typst-assets" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" +checksum = "4fe00da1b24da2c4a7da532fc33d0c3bd43a902ca4c408ee2c36eabe70f2f4ba" [[package]] name = "typst-macros" -version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "typst-pdf" -version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" dependencies = [ + "arrayvec 0.7.6", "base64 0.22.1", "bytemuck", "comemo 0.4.0", "ecow 0.2.2", "image", - "miniz_oxide 0.7.4", + "indexmap 2.6.0", + "miniz_oxide", "once_cell", "pdf-writer", + "serde", "subsetter", "svg2pdf", - "ttf-parser", + "ttf-parser 0.24.1", "typst", "typst-assets", "typst-macros", "typst-timing", - "unicode-properties", "unscanny", "xmp-writer", ] [[package]] name = "typst-preview" -version = "0.11.32" +version = "0.12.0" dependencies = [ "clap", "comemo 0.4.0", "env_logger", "futures", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "once_cell", "reflexo-typst", "reflexo-vec2svg", "serde", "serde_json", - "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "typst", "typst-assets", @@ -4513,18 +4794,17 @@ dependencies = [ [[package]] name = "typst-render" -version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" dependencies = [ "bytemuck", "comemo 0.4.0", - "flate2", "image", "pixglyph", "resvg", - "roxmltree 0.19.0", + "roxmltree", "tiny-skia", - "ttf-parser", + "ttf-parser 0.24.1", "typst", "typst-macros", "typst-timing", @@ -4533,23 +4813,23 @@ dependencies = [ [[package]] name = "typst-shim" -version = "0.11.32" +version = "0.12.0" dependencies = [ "cfg-if", "typst", - "typst-syntax 0.11.1", + "typst-syntax 0.12.0", ] [[package]] name = "typst-svg" -version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" dependencies = [ "base64 0.22.1", "comemo 0.4.0", "ecow 0.2.2", "flate2", - "ttf-parser", + "ttf-parser 0.24.1", "typst", "typst-macros", "typst-timing", @@ -4576,7 +4856,8 @@ dependencies = [ [[package]] name = "typst-syntax" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3db69f2f41613b1ff6edbec44fd7dc524137f099ee36c46f560cedeaadb40c4" dependencies = [ "comemo 0.4.0", "ecow 0.2.2", @@ -4589,15 +4870,44 @@ dependencies = [ "unscanny", ] +[[package]] +name = "typst-syntax" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" +dependencies = [ + "ecow 0.2.2", + "once_cell", + "serde", + "toml 0.8.19", + "typst-utils", + "unicode-ident", + "unicode-math-class", + "unicode-script", + "unicode-segmentation", + "unscanny", +] + [[package]] name = "typst-timing" -version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" dependencies = [ "parking_lot", "serde", "serde_json", - "typst-syntax 0.11.1", + "typst-syntax 0.12.0", +] + +[[package]] +name = "typst-utils" +version = "0.12.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9" +dependencies = [ + "once_cell", + "portable-atomic", + "rayon", + "siphasher 1.0.1", + "thin-vec", ] [[package]] @@ -4617,14 +4927,14 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.33" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c430c527e8048f19522448613e95da687ed64fb0a3b78969f0643e6e99a95ef" +checksum = "ff9884838ec5385e1ebd940752eed327ed13aaa4ce77c2c3886e8640b0a9de2e" dependencies = [ "anyhow", "itertools 0.13.0", "pretty", - "typst-syntax 0.11.1", + "typst-syntax 0.12.0", "vergen", ] @@ -4649,30 +4959,27 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[package]] name = "unicode-ident" @@ -4697,9 +5004,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" @@ -4725,6 +5032,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -4757,62 +5070,29 @@ dependencies = [ [[package]] name = "usvg" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ + "base64 0.22.1", "data-url", "flate2", + "fontdb", "imagesize", "kurbo", "log", - "roxmltree 0.19.0", - "simplecss", - "siphasher 0.3.11", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" -dependencies = [ - "fontdb", - "kurbo", - "log", + "pico-args", + "roxmltree", "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" -dependencies = [ + "simplecss", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -4835,9 +5115,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "vcpkg" @@ -4893,9 +5173,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -4904,24 +5184,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -4931,9 +5211,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4941,47 +5221,56 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasmi" -version = "0.31.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +checksum = "dbaac6e702fa7b52258e5ac90d6e20a40afb37a1fbe7c645d0903ee42c5f85f4" dependencies = [ + "arrayvec 0.7.6", + "multi-stash", + "num-derive", + "num-traits", "smallvec", "spin", - "wasmi_arena", + "wasmi_collections", "wasmi_core", "wasmparser-nostd", ] [[package]] -name = "wasmi_arena" -version = "0.4.1" +name = "wasmi_collections" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +checksum = "8ff59e30e550a509cc689ec638e5042be4d78ec9f6dd8a71fd02ee28776a74fd" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.14.5", + "string-interner", +] [[package]] name = "wasmi_core" -version = "0.13.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +checksum = "13e10c674add0f92f47bf8ad57c55ee3ac1762a0d9baf07535e27e22b758a916" dependencies = [ "downcast-rs", "libm", @@ -5000,9 +5289,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -5014,6 +5303,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "weezl" version = "0.1.8" @@ -5060,6 +5358,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -5219,9 +5547,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -5276,9 +5604,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" +checksum = "8254499146a4fd0c86e3e99cf4a9f468f595808fb49ff8f3e495f2b117bf4ebc" [[package]] name = "yaml-rust" @@ -5320,7 +5648,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -5342,7 +5670,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5362,10 +5690,16 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zerotrie" version = "0.1.3" @@ -5398,5 +5732,20 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix index 0de208f818..f776a9192b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix @@ -17,19 +17,19 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.32"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-xXrE4LOzcR4TCoBD7jbS1Ba7kBLBPiF3GI0wjq5GXWA="; + hash = "sha256-z0JfHEG01q83iHAQA/Ke/DPhKQYwkWv9HRpeUdXmTxs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.11.1" = "sha256-dQf4qYaOni/jwIjRVXXCZLTn6ox3v6EyhCbaONqNtcw="; + "typst-0.12.0" = "sha256-E2wSVHqY3SymCwKgbLsASJYaWfrbF8acH15B2STEBF8="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; }; @@ -53,14 +53,10 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=e2e" - # Fails because of missing `creation_timestamp` field - # https://github.com/NixOS/nixpkgs/pull/328756#issuecomment-2241322796 - "--skip=test_config_update" - # Require internet access - "--skip=docs::tests::cetz" - "--skip=docs::tests::tidy" - "--skip=docs::tests::touying" + "--skip=docs::package::tests::cetz" + "--skip=docs::package::tests::tidy" + "--skip=docs::package::tests::touying" ]; nativeInstallCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/tl/tlsinfo/package.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlsinfo/package.nix new file mode 100644 index 0000000000..197367dd3a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tl/tlsinfo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "tlsinfo"; + version = "0.1.41"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "tlsinfo"; + rev = "refs/tags/v${version}"; + hash = "sha256-II5/UDWVeEoupM1Ijty2A9M/qwWA2/b4Y68lTkxnJ9o="; + }; + + vendorHash = "sha256-IyinAjgK4vm+TkSGQq+XnY9BESsNvXgz84BRzNyZtJY="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + changelog = "https://github.com/paepckehh/tlsinfo/releases/tag/v${version}"; + homepage = "https://paepcke.de/tlsinfo"; + description = "Tool to analyze and troubleshoot TLS connections"; + license = lib.licenses.bsd3; + mainProgram = "tlsinfo"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/to/tocpdf/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tocpdf/package.nix index ac830f7d1c..b2136973fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tocpdf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tocpdf/package.nix @@ -1,18 +1,19 @@ { lib, python3Packages, - fetchPypi, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "tocpdf"; - version = "0.3.3"; + version = "0.3.9"; pyproject = true; - src = fetchPypi { - pname = "tocPDF"; - inherit version; - hash = "sha256-B+UcvyjWceVErf1uDyGGTGwKBCGHmSOF19Vbk15cPp8="; + src = fetchFromGitHub { + owner = "kszenes"; + repo = "tocPDF"; + rev = "v${version}"; + hash = "sha256-RaNMhEgJ2pSL9BvK1d2Z8AsUPhARaRtEiCnt/2E2uNs="; }; build-system = with python3Packages; [ @@ -27,14 +28,21 @@ python3Packages.buildPythonApplication rec { tqdm ]; - # no test - doCheck = false; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + disabledTests = [ + # touches network + "test_read_toc" + ]; pythonImportsCheck = [ "tocPDF" ]; meta = { description = "Automatic CLI tool for generating outline of PDFs based on the table of contents"; homepage = "https://github.com/kszenes/tocPDF"; + changelog = "https://github.com/kszenes/tocPDF/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dansbandit ]; mainProgram = "tocPDF"; diff --git a/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix index 1dc3a8db3c..9a11200fb9 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.11.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; rev = version; - hash = "sha256-b4uSztroeOKPOyPwxVB3ofkAmDpWFstHDQX2IwQwG/4="; + hash = "sha256-v7+WDxGUWCrZMhm0TXMIZTQZTzHYNauX2LIOV3zz+9A="; }; - vendorHash = "sha256-B+SmzNLAXIjkUO1JGpD1eqa52Z1zOdPiG8urvLFXf88="; + vendorHash = "sha256-wmyaTZX181w4Kiiw1sZ4NeIDY63PwW+ayvtwrLSiF24="; nativeBuildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix index 506fb781eb..9c7fb11aa3 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tradingview"; - version = "2.9.2"; - revision = "59"; + version = "2.9.3"; + revision = "60"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap"; - hash = "sha256-qGQZKl8h23H8npdIBeVw3aCZPZiCfPsawzQxUY31Ujs="; + hash = "sha256-Oa3YfmXDiqKxEMJloTu6ihJ6LKoz2XwQ0su1KrlSaYo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix index 58dfb320bd..3b6f2c4c70 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-X7JGzTaTm7CE5+mTvnV93d5Hx2A1vF+aufmC5/xWRtc="; + hash = "sha256-9RZmLs95dHZw5hgob5+iogxb6DV0FqVaY+PavGFpXj4="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; diff --git a/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch b/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch deleted file mode 100644 index c6e9336874..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/enable-lazy_cell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/crates/turborepo-lib/src/lib.rs b/crates/turborepo-lib/src/lib.rs -index e8d41933da..26b8c7c92f 100644 ---- a/crates/turborepo-lib/src/lib.rs -+++ b/crates/turborepo-lib/src/lib.rs -@@ -2,6 +2,7 @@ - #![feature(box_patterns)] - #![feature(error_generic_member_access)] - #![feature(hash_extract_if)] -+#![feature(lazy_cell)] - #![feature(option_get_or_insert_default)] - #![feature(once_cell_try)] - #![feature(panic_info_message)] diff --git a/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix index f9228f310c..d4c20bb38b 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "turbo-unwrapped"; - version = "2.0.12"; + version = "2.2.3"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; - rev = "v${version}"; - hash = "sha256-rh9BX8M3Kgu07Pz4G3AM6S9zeK3Bb6CzOpcYo7rQgIw="; + rev = "refs/tags/v${version}"; + hash = "sha256-MDvwitzZVPVjdIVEAV1aKMAVeLSTMM2owH5RSfVg+rU="; }; - patches = [ - # upstream uses nightly where lazy_cell is stable - ./enable-lazy_cell.patch - ]; - - cargoHash = "sha256-oZHSoPrPCUwXSrxEASm4LuYO+XHyNDRRl38Q7U7F/lk="; + cargoHash = "sha256-XBI/eiOyKk80ZDFLD2HCTFYRWvC7qtzQY/zFCmKdKSM="; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tuxguitar/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxguitar/package.nix new file mode 100644 index 0000000000..d3399471a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tu/tuxguitar/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + swt, + jre, + makeWrapper, + alsa-lib, + jack2, + fluidsynth, + libpulseaudio, + lilv, + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + version = "1.6.4"; + pname = "tuxguitar"; + + src = fetchurl { + url = "https://github.com/helge17/tuxguitar/releases/download/${finalAttrs.version}/tuxguitar-${finalAttrs.version}-linux-swt-amd64.tar.gz"; + hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + mkdir -p $out/bin + cp -r dist lib share $out/ + cp tuxguitar.sh $out/bin/tuxguitar + + ln -s $out/dist $out/bin/dist + ln -s $out/lib $out/bin/lib + ln -s $out/share $out/bin/share + + wrapProgram $out/bin/tuxguitar \ + --set JAVA "${jre}/bin/java" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${ + lib.makeLibraryPath [ + swt + alsa-lib + jack2 + fluidsynth + libpulseaudio + lilv + ] + }" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" + ''; + + passthru.tests = { + nixos = nixosTests.tuxguitar; + }; + + meta = { + description = "Multitrack guitar tablature editor"; + longDescription = '' + TuxGuitar is a multitrack guitar tablature editor and player written + in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. + ''; + homepage = "http://www.tuxguitar.com.ar/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ ardumont ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typst/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ty/typst/Cargo.lock index a613f4d957..5685a9cd22 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typst/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ty/typst/Cargo.lock @@ -3,16 +3,28 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -34,47 +46,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -94,24 +107,27 @@ name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "az" @@ -121,21 +137,15 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "biblatex" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" +checksum = "a35a7317fcbdbef94b60d0dd0a658711a936accfce4a631fea4bf8e527eff3c2" dependencies = [ "numerals", "paste", @@ -176,9 +186,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -197,15 +207,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -214,13 +230,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "cc" -version = "1.0.90" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -249,14 +272,14 @@ checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -288,19 +311,19 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" +checksum = "92fea693c83bd967604be367dc1e1b4895625eabafec2eec66c51092e18e700e" dependencies = [ - "quick-xml", + "quick-xml 0.36.2", "serde", ] [[package]] name = "clap" -version = "4.5.2" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -308,30 +331,31 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", + "terminal_size", ] [[package]] name = "clap_complete" -version = "4.5.1" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +checksum = "74a01f4f9ee6c066d42a1c8dedf0dcddad16c72a8981a309d6398de3a75b0c39" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -341,15 +365,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clap_mangen" -version = "0.2.20" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -371,6 +395,27 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "color-print" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -379,9 +424,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "comemo" @@ -392,7 +437,7 @@ dependencies = [ "comemo-macros", "once_cell", "parking_lot", - "siphasher 1.0.0", + "siphasher 1.0.1", ] [[package]] @@ -418,9 +463,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core_maths" @@ -433,18 +478,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -470,9 +515,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -516,6 +561,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dirs" version = "5.0.1" @@ -539,9 +595,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -550,24 +606,24 @@ dependencies = [ [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "ecow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba31a30727c42ff5e60468d695c7f21e43a6db2808b7195adcab908fbd9f794" +checksum = "54bfbb1708988623190a6c4dbedaeaf0f53c20c6395abd6a01feb327b3146f4b" dependencies = [ "serde", ] [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -575,6 +631,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "enum-ordinalize" version = "4.3.0" @@ -613,9 +675,9 @@ 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", @@ -639,45 +701,36 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.1" 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 = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -697,18 +750,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -774,25 +827,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", "wasi", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.13.1" @@ -805,9 +848,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -821,24 +864,33 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "hayagriva" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" +checksum = "7a3635c2577f77499c9dc3dceeef2e64e6c146e711b1861507a0f15b20641348" dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.2.5", + "indexmap 2.6.0", "numerals", "paste", "serde", - "serde_yaml 0.9.32", + "serde_yaml 0.9.34+deprecated", "thiserror", "unic-langid", "unicode-segmentation", @@ -848,9 +900,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hypher" @@ -860,9 +912,9 @@ checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -883,9 +935,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ "displaydoc", "serde", @@ -896,9 +948,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", "litemap", @@ -909,9 +961,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ "displaydoc", "icu_locid", @@ -923,15 +975,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" [[package]] name = "icu_properties" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ "displaydoc", "icu_collections", @@ -945,15 +997,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" [[package]] name = "icu_provider" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ "displaydoc", "icu_locid", @@ -970,9 +1022,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" dependencies = [ "icu_locid", "icu_locid_transform", @@ -983,9 +1035,9 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" +checksum = "c24b98d1365f55d78186c205817631a4acf08d7a45bdf5dc9dcf9c5d54dccf51" dependencies = [ "icu_provider", "postcard", @@ -997,9 +1049,9 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", @@ -1008,9 +1060,9 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" dependencies = [ "core_maths", "displaydoc", @@ -1025,9 +1077,9 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" [[package]] name = "idna" @@ -1047,24 +1099,35 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "image" -version = "0.24.9" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", - "gif 0.13.1", - "jpeg-decoder", + "gif", "num-traits", "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", ] [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "indexmap" @@ -1078,12 +1141,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.0", "rayon", "serde", ] @@ -1114,15 +1177,6 @@ dependencies = [ "libc", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "is-docker" version = "0.2.0" @@ -1143,31 +1197,31 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.10" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1203,39 +1257,34 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" dependencies = [ "arrayvec", + "smallvec", ] -[[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.153" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdeflate-sys" -version = "1.19.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9caa76c8cc6ee8c4efcf8f4514a812ebcad3aa7d3b548efe4d26da1203f177" +checksum = "7b14a6afa4e2e1d343fd793a1c0a7e5857a73a2697c2ff2c98ac00d6c4ecc820" dependencies = [ "cc", ] [[package]] name = "libdeflater" -version = "1.19.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265a985bd31e5f22e2b2ac107cbed44c6ccf40ae236e46963cd00dd213e4bd03" +checksum = "a17fe2badabdaf756f620748311e99ef99a5fdd681562dfd343fdb16ed7d4797" dependencies = [ "libdeflate-sys", ] @@ -1259,24 +1308,15 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[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.2", + "bitflags 2.6.0", "libc", "redox_syscall", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1285,15 +1325,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lipsum" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5e9ef2d2ad6fe67a59ace27c203c8d3a71d195532ee82e3bbe0d5f9a9ca541" +checksum = "636860251af8963cc40f6b4baadee105f02e21b28131d76eba8e40ce84ab8064" dependencies = [ "rand", "rand_chacha", @@ -1301,28 +1341,34 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" dependencies = [ "serde", ] [[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", ] [[package]] -name = "log" -version = "0.4.21" +name = "lockfree-object-pool" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lzma-sys" @@ -1337,26 +1383,32 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] [[package]] -name = "miniz_oxide" -version = "0.7.2" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", "simd-adler32", ] @@ -1372,6 +1424,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "mutate_once" version = "0.1.1" @@ -1380,11 +1438,10 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[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", @@ -1396,13 +1453,23 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "notify" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1417,11 +1484,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1432,6 +1498,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -1443,9 +1520,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1458,15 +1535,18 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "open" -version = "5.1.1" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b3fbb0d52bf0cbb5225ba3d2c303aa136031d43abff98284332a9981ecddec" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -1475,11 +1555,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1507,18 +1587,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1535,14 +1615,16 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "oxipng" -version = "9.0.0" +version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e5c341ef78a228e47a551bfd15ff885d8c501af49f953358763a538c01f14d" +checksum = "ec25597808aff9f632f018f0fe8985c6f670598ac5241d220a9f2d32ff46812e" dependencies = [ "bitvec", + "clap", + "clap_mangen", "crossbeam-channel", "filetime", - "indexmap 2.2.5", + "indexmap 2.6.0", "libdeflater", "log", "rayon", @@ -1554,9 +1636,9 @@ dependencies = [ [[package]] name = "palette" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", @@ -1566,10 +1648,11 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ + "by_address", "proc-macro2", "quote", "syn", @@ -1577,9 +1660,9 @@ dependencies = [ [[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", @@ -1587,22 +1670,22 @@ 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", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -1612,11 +1695,11 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pdf-writer" -version = "0.9.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" +checksum = "be17f48d7fbbd22c6efedb58af5d409aa578e407f40b29a0bcb4e66ed84c5c98" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "itoa", "memchr", "ryu", @@ -1678,38 +1761,37 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pixglyph" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e0f8ad4c197db38125b880c3c44544788665c7d5f4c42f5a35da44bca1a712" +checksum = "d15afa937836bf3d876f5a04ce28810c06045857bf46c3d0d31073b8aada5494" dependencies = [ "ttf-parser", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[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.7", - "indexmap 2.2.5", - "line-wrap", - "quick-xml", + "base64", + "indexmap 2.6.0", + "quick-xml 0.32.0", "serde", "time", ] [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1720,18 +1802,19 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] @@ -1743,24 +1826,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -1771,7 +1857,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "getopts", "memchr", "unicase", @@ -1784,10 +1870,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -1795,9 +1896,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1835,9 +1936,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1855,18 +1956,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -1875,9 +1976,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -1887,9 +1988,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1898,47 +1999,57 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "resvg" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" dependencies = [ - "gif 0.12.0", - "jpeg-decoder", + "gif", + "image-webp", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] [[package]] name = "roff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + +[[package]] +name = "rust_decimal" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +dependencies = [ + "arrayvec", + "num-traits", +] [[package]] name = "rustc-hash" @@ -1948,20 +2059,20 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1970,18 +2081,20 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", "ttf-parser", "unicode-bidi-mirroring", @@ -1992,15 +2105,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[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" @@ -2013,11 +2120,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]] @@ -2028,11 +2135,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2041,9 +2148,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2051,35 +2158,35 @@ dependencies = [ [[package]] name = "self-replace" -version = "1.3.7" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55" +checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7" dependencies = [ - "fastrand 1.9.0", + "fastrand", "tempfile", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2088,20 +2195,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2120,11 +2228,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -2137,6 +2245,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -2160,9 +2274,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slotmap" @@ -2175,9 +2289,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spin" @@ -2193,15 +2307,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -2214,25 +2328,36 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.11.0" +name = "string-interner" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck", "proc-macro2", @@ -2243,40 +2368,45 @@ dependencies = [ [[package]] name = "subsetter" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" +checksum = "74f98178f34057d4d4de93d68104007c6dea4dfac930204a69ab4622daefa648" [[package]] name = "svg2pdf" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" +checksum = "5014c9dadcf318fb7ef8c16438e95abcc9de1ae24d60d5bccc64c55100c50364" dependencies = [ + "fontdb", "image", + "log", "miniz_oxide", "once_cell", "pdf-writer", "resvg", + "siphasher 1.0.1", + "subsetter", "tiny-skia", + "ttf-parser", "usvg", ] [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ "kurbo", - "siphasher 0.3.11", + "siphasher 1.0.1", ] [[package]] name = "syn" -version = "2.0.52" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -2324,9 +2454,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -2335,14 +2465,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2355,19 +2486,35 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.57" +name = "terminal_size" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -2433,9 +2580,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", "serde", @@ -2444,9 +2591,9 @@ dependencies = [ [[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", ] @@ -2459,9 +2606,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.10" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2471,20 +2618,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -2493,15 +2640,18 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] [[package]] name = "two-face" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" +checksum = "0ccd4843ea031c609fe9c16cae00e9657bad8a9f735a3cc2e420955d802b4268" dependencies = [ "once_cell", "serde", @@ -2516,15 +2666,18 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.11.1" +version = "0.12.0" dependencies = [ + "arrayvec", "az", - "bitflags 2.4.2", + "bitflags 2.6.0", + "bumpalo", "chinese-number", "ciborium", "comemo", "csv", "ecow", + "flate2", "fontdb", "hayagriva", "hypher", @@ -2535,7 +2688,7 @@ dependencies = [ "icu_segmenter", "if_chain", "image", - "indexmap 2.2.5", + "indexmap 2.6.0", "kamadak-exif", "kurbo", "lipsum", @@ -2549,11 +2702,12 @@ dependencies = [ "rayon", "regex", "roxmltree", + "rust_decimal", "rustybuzz", "serde", "serde_json", - "serde_yaml 0.9.32", - "siphasher 1.0.0", + "serde_yaml 0.9.34+deprecated", + "siphasher 1.0.1", "smallvec", "stacker", "syntect", @@ -2567,41 +2721,41 @@ dependencies = [ "typst-macros", "typst-syntax", "typst-timing", + "typst-utils", "unicode-bidi", "unicode-math-class", "unicode-script", "unicode-segmentation", + "unscanny", "usvg", "wasmi", + "xmlwriter", ] [[package]] name = "typst-assets" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" +checksum = "4fe00da1b24da2c4a7da532fc33d0c3bd43a902ca4c408ee2c36eabe70f2f4ba" [[package]] name = "typst-cli" -version = "0.11.1" +version = "0.12.0" dependencies = [ "chrono", "clap", "clap_complete", "clap_mangen", "codespan-reporting", + "color-print", "comemo", "dirs", "ecow", - "env_proxy", - "flate2", - "fontdb", "fs_extra", "native-tls", "notify", "once_cell", "open", - "openssl", "parking_lot", "pathdiff", "rayon", @@ -2610,13 +2764,14 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml 0.9.32", + "serde_yaml 0.9.34+deprecated", "shell-escape", "tar", "tempfile", "toml", "typst", "typst-assets", + "typst-kit", "typst-macros", "typst-pdf", "typst-render", @@ -2629,12 +2784,12 @@ dependencies = [ [[package]] name = "typst-dev-assets" -version = "0.11.1" -source = "git+https://github.com/typst/typst-dev-assets?tag=v0.11.1#35caed3a870d46e827cffaa9dc450e38bede2a37" +version = "0.12.0" +source = "git+https://github.com/typst/typst-dev-assets?tag=v0.12.0#b07d1560143d6883887358d30edb25cb12fcf5b9" [[package]] name = "typst-docs" -version = "0.11.1" +version = "0.12.0" dependencies = [ "clap", "comemo", @@ -2644,7 +2799,7 @@ dependencies = [ "pulldown-cmark", "serde", "serde_json", - "serde_yaml 0.9.32", + "serde_yaml 0.9.34+deprecated", "syntect", "typed-arena", "typst", @@ -2657,7 +2812,7 @@ dependencies = [ [[package]] name = "typst-fuzz" -version = "0.11.1" +version = "0.12.0" dependencies = [ "comemo", "libfuzzer-sys", @@ -2669,7 +2824,7 @@ dependencies = [ [[package]] name = "typst-ide" -version = "0.11.1" +version = "0.12.0" dependencies = [ "comemo", "ecow", @@ -2683,9 +2838,29 @@ dependencies = [ "unscanny", ] +[[package]] +name = "typst-kit" +version = "0.12.0" +dependencies = [ + "dirs", + "ecow", + "env_proxy", + "flate2", + "fontdb", + "native-tls", + "once_cell", + "openssl", + "tar", + "typst", + "typst-assets", + "typst-timing", + "typst-utils", + "ureq", +] + [[package]] name = "typst-macros" -version = "0.11.1" +version = "0.12.0" dependencies = [ "heck", "proc-macro2", @@ -2695,16 +2870,19 @@ dependencies = [ [[package]] name = "typst-pdf" -version = "0.11.1" +version = "0.12.0" dependencies = [ - "base64 0.22.0", + "arrayvec", + "base64", "bytemuck", "comemo", "ecow", "image", + "indexmap 2.6.0", "miniz_oxide", "once_cell", "pdf-writer", + "serde", "subsetter", "svg2pdf", "ttf-parser", @@ -2712,18 +2890,16 @@ dependencies = [ "typst-assets", "typst-macros", "typst-timing", - "unicode-properties", "unscanny", "xmp-writer", ] [[package]] name = "typst-render" -version = "0.11.1" +version = "0.12.0" dependencies = [ "bytemuck", "comemo", - "flate2", "image", "pixglyph", "resvg", @@ -2738,9 +2914,9 @@ dependencies = [ [[package]] name = "typst-svg" -version = "0.11.1" +version = "0.12.0" dependencies = [ - "base64 0.22.0", + "base64", "comemo", "ecow", "flate2", @@ -2754,12 +2930,13 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.11.1" +version = "0.12.0" dependencies = [ - "comemo", "ecow", "once_cell", "serde", + "toml", + "typst-utils", "unicode-ident", "unicode-math-class", "unicode-script", @@ -2769,7 +2946,7 @@ dependencies = [ [[package]] name = "typst-tests" -version = "0.11.1" +version = "0.12.0" dependencies = [ "clap", "comemo", @@ -2778,6 +2955,7 @@ dependencies = [ "oxipng", "parking_lot", "rayon", + "regex", "tiny-skia", "ttf-parser", "typst", @@ -2792,7 +2970,7 @@ dependencies = [ [[package]] name = "typst-timing" -version = "0.11.1" +version = "0.12.0" dependencies = [ "parking_lot", "serde", @@ -2800,20 +2978,31 @@ dependencies = [ "typst-syntax", ] +[[package]] +name = "typst-utils" +version = "0.12.0" +dependencies = [ + "once_cell", + "portable-atomic", + "rayon", + "siphasher 1.0.1", + "thin-vec", +] + [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -2830,27 +3019,27 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[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-math-class" @@ -2860,30 +3049,30 @@ checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -2893,15 +3082,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unscanny" @@ -2911,11 +3100,11 @@ checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" [[package]] name = "ureq" -version = "2.9.6" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ - "base64 0.21.7", + "base64", "flate2", "log", "native-tls", @@ -2927,9 +3116,9 @@ dependencies = [ [[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", @@ -2939,62 +3128,29 @@ dependencies = [ [[package]] name = "usvg" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ + "base64", "data-url", "flate2", + "fontdb", "imagesize", "kurbo", "log", + "pico-args", "roxmltree", - "simplecss", - "siphasher 0.3.11", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" -dependencies = [ - "fontdb", - "kurbo", - "log", "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" -dependencies = [ + "simplecss", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -3005,9 +3161,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[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 = "vcpkg" @@ -3017,9 +3173,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3039,19 +3195,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3064,9 +3221,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3074,9 +3231,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3087,34 +3244,43 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasmi" -version = "0.31.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +checksum = "dbaac6e702fa7b52258e5ac90d6e20a40afb37a1fbe7c645d0903ee42c5f85f4" dependencies = [ + "arrayvec", + "multi-stash", + "num-derive", + "num-traits", "smallvec", "spin", - "wasmi_arena", + "wasmi_collections", "wasmi_core", "wasmparser-nostd", ] [[package]] -name = "wasmi_arena" -version = "0.4.1" +name = "wasmi_collections" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +checksum = "8ff59e30e550a509cc689ec638e5042be4d78ec9f6dd8a71fd02ee28776a74fd" +dependencies = [ + "ahash", + "hashbrown 0.14.5", + "string-interner", +] [[package]] name = "wasmi_core" -version = "0.13.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +checksum = "13e10c674add0f92f47bf8ad57c55ee3ac1762a0d9baf07535e27e22b758a916" dependencies = [ "downcast-rs", "libm", @@ -3124,9 +3290,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -3137,44 +3303,22 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3192,7 +3336,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3212,17 +3365,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.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]] @@ -3233,9 +3387,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3245,9 +3399,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3257,9 +3411,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +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" @@ -3269,9 +3429,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3281,9 +3441,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3293,9 +3453,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3305,24 +3465,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] [[package]] name = "writeable" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wyz" @@ -3358,9 +3518,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" +checksum = "8254499146a4fd0c86e3e99cf4a9f468f595808fb49ff8f3e495f2b117bf4ebc" [[package]] name = "xz2" @@ -3392,9 +3552,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ "serde", "stable_deref_trait", @@ -3404,9 +3564,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", @@ -3415,19 +3575,40 @@ dependencies = [ ] [[package]] -name = "zerofrom" -version = "0.1.3" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", @@ -3437,9 +3618,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" dependencies = [ "displaydoc", "litemap", @@ -3449,9 +3630,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ "serde", "yoke", @@ -3461,9 +3642,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", @@ -3472,24 +3653,46 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap 2.6.0", + "memchr", + "thiserror", + "zopfli", ] [[package]] name = "zopfli" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" dependencies = [ + "bumpalo", "crc32fast", + "lockfree-object-pool", "log", + "once_cell", "simd-adler32", - "typed-arena", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix index de06edfee2..9415daee69 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix @@ -1,30 +1,32 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, pkg-config -, openssl -, xz -, stdenv -, darwin -, nix-update-script +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + openssl, + xz, + stdenv, + darwin, + nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; - rev = "v${version}"; - hash = "sha256-FagjVU8BJZStE/geexZERuV2P28iF/pPn2mTi1Gu9iU="; + rev = "refs/tags/v${version}"; + hash = "sha256-OfTMJ7ylVOJjL295W3Flj2upTiUQXmfkyDFSE1v8+a4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-dev-assets-0.11.1" = "sha256-SMRtitDHFpdMEoOuPBnC3RBTyZ96hb4KmMSCXpAyKfU="; + "typst-dev-assets-0.12.0" = "sha256-YLxLuhpAUzktjyprZAhZ4GjcXEDUDdLtSzc5onzLuto="; }; }; @@ -33,14 +35,16 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - xz - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ + openssl + xz + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + ]; env = { GEN_ARTIFACTS = "artifacts"; @@ -51,9 +55,6 @@ rustPlatform.buildRustPackage rec { # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context" substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads' substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads' - - # Fix build with Rust 1.80; remove on next release - ln -sf ${./Cargo.lock} Cargo.lock ''; postInstall = '' @@ -65,6 +66,12 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--workspace" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; meta = { @@ -73,6 +80,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/typst/typst"; license = lib.licenses.asl20; mainProgram = "typst"; - maintainers = with lib.maintainers; [ drupol figsoda kanashimia ]; + maintainers = with lib.maintainers; [ + drupol + figsoda + kanashimia + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock index 73892cb629..95e6754fef 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -29,10 +29,22 @@ dependencies = [ ] [[package]] -name = "aho-corasick" -version = "1.1.2" +name = "ahash" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -54,47 +66,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -102,15 +115,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "append-only-vec" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "approx" @@ -122,10 +129,19 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.7" +name = "archery" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "eae2ed21cd55021f05707a807a5fc85695dafb98832921f6cfa06db67ca5b869" +dependencies = [ + "triomphe", +] + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -135,15 +151,15 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "az" @@ -153,50 +169,34 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "base64-serde" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" -dependencies = [ - "base64 0.21.7", - "serde", -] +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "biblatex" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" +checksum = "a35a7317fcbdbef94b60d0dd0a658711a936accfce4a631fea4bf8e527eff3c2" dependencies = [ "numerals", "paste", - "strum 0.26.2", + "strum 0.26.3", "unicode-normalization", "unscanny", ] @@ -233,9 +233,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -263,9 +263,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytecheck" @@ -291,9 +297,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -302,25 +308,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.6.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -341,12 +353,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -375,15 +388,15 @@ checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -415,19 +428,19 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82108f2b676c954076d2e5044f19a6a03887b24bd42804f322e0650d13035899" +checksum = "92fea693c83bd967604be367dc1e1b4895625eabafec2eec66c51092e18e700e" dependencies = [ - "quick-xml", + "quick-xml 0.36.2", "serde", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -435,33 +448,42 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.5.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" +dependencies = [ + "clap", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cobs" @@ -487,9 +509,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "comemo" @@ -500,7 +522,7 @@ dependencies = [ "comemo-macros", "once_cell", "parking_lot", - "siphasher 1.0.0", + "siphasher 1.0.1", ] [[package]] @@ -511,7 +533,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -538,9 +560,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core_maths" @@ -553,27 +575,27 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -608,9 +630,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -651,9 +673,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -661,27 +683,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.52", + "strsim", + "syn 2.0.79", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -691,7 +713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -752,50 +774,35 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] -[[package]] -name = "dissimilar" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" - [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "ecow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba31a30727c42ff5e60468d695c7f21e43a6db2808b7195adcab908fbd9f794" +checksum = "54bfbb1708988623190a6c4dbedaeaf0f53c20c6395abd6a01feb327b3146f4b" dependencies = [ "serde", ] [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -803,21 +810,18 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum-ordinalize" version = "4.3.0" @@ -835,7 +839,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -846,9 +850,9 @@ 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", @@ -856,12 +860,9 @@ dependencies = [ [[package]] name = "escape8259" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" -dependencies = [ - "rustversion", -] +checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6" [[package]] name = "fancy-regex" @@ -881,36 +882,36 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -930,9 +931,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] @@ -948,7 +949,21 @@ dependencies = [ "memmap2", "slotmap", "tinyvec", - "ttf-parser", + "ttf-parser 0.20.0", +] + +[[package]] +name = "fontdb" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser 0.24.1", ] [[package]] @@ -984,12 +999,6 @@ dependencies = [ "libc", ] -[[package]] -name = "fst" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" - [[package]] name = "funty" version = "2.0.0" @@ -997,46 +1006,87 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] -name = "futures-channel" -version = "0.3.30" +name = "futures" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ + "futures-channel", "futures-core", "futures-io", + "futures-macro", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -1065,25 +1115,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", "wasi", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.13.1" @@ -1096,47 +1136,28 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", "url", ] -[[package]] -name = "h2" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1148,25 +1169,34 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "hayagriva" -version = "0.5.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2e670de5191df083ddd112cd253049f8213277ccf0c15e18a8bf10e6c666cc" +checksum = "7a3635c2577f77499c9dc3dceeef2e64e6c146e711b1861507a0f15b20641348" dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.2.6", + "indexmap 2.6.0", "numerals", "paste", "serde", @@ -1204,9 +1234,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1215,76 +1245,103 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "hyper" -version = "0.14.28" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", ] [[package]] @@ -1295,9 +1352,9 @@ checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1318,9 +1375,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ "displaydoc", "serde", @@ -1331,9 +1388,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", "litemap", @@ -1344,9 +1401,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ "displaydoc", "icu_locid", @@ -1358,15 +1415,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" [[package]] name = "icu_properties" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ "displaydoc", "icu_collections", @@ -1380,15 +1437,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" [[package]] name = "icu_provider" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ "displaydoc", "icu_locid", @@ -1405,9 +1462,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" dependencies = [ "icu_locid", "icu_locid_transform", @@ -1418,9 +1475,9 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" +checksum = "c24b98d1365f55d78186c205817631a4acf08d7a45bdf5dc9dcf9c5d54dccf51" dependencies = [ "icu_provider", "postcard", @@ -1432,20 +1489,20 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "icu_segmenter" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" dependencies = [ "core_maths", "displaydoc", @@ -1460,9 +1517,9 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" [[package]] name = "ident_case" @@ -1488,24 +1545,35 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "image" -version = "0.24.9" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", - "gif 0.13.1", - "jpeg-decoder", + "gif", "num-traits", "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", ] [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "indexmap" @@ -1520,12 +1588,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.0", "serde", ] @@ -1557,9 +1625,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -1569,54 +1637,54 @@ 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", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1656,26 +1724,36 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec 0.7.6", + "smallvec", ] [[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 = "libc" -version = "0.2.153" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -1691,32 +1769,32 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[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.2", + "bitflags 2.6.0", "libc", "redox_syscall", ] [[package]] name = "libtest-mimic" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f0f4c6f44ecfd52e8b443f2ad18f2b996540135771561283c2352ce56a1c70b" +checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33" dependencies = [ + "anstream", + "anstyle", "clap", "escape8259", - "termcolor", - "threadpool", ] [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -1724,15 +1802,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1741,9 +1810,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lipsum" @@ -1757,18 +1826,18 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" dependencies = [ "serde", ] [[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", @@ -1776,21 +1845,21 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -1803,9 +1872,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -1813,11 +1882,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", "simd-adler32", ] @@ -1833,6 +1902,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "mutate_once" version = "0.1.1" @@ -1841,11 +1928,10 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[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", @@ -1869,7 +1955,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1877,18 +1963,17 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1899,6 +1984,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -1910,23 +2006,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" 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", - "libc", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -1944,26 +2030,26 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.32.2" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1980,7 +2066,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -1991,9 +2077,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2009,9 +2095,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "palette" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", @@ -2021,20 +2107,21 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ + "by_address", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[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", @@ -2042,22 +2129,22 @@ 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", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-clean" @@ -2067,17 +2154,17 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pdf-writer" -version = "0.9.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" +checksum = "be17f48d7fbbd22c6efedb58af5d409aa578e407f40b29a0bcb4e66ed84c5c98" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "itoa", "memchr", "ryu", @@ -2119,7 +2206,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -2139,9 +2226,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[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" @@ -2151,38 +2238,37 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixglyph" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e0f8ad4c197db38125b880c3c44544788665c7d5f4c42f5a35da44bca1a712" +checksum = "d15afa937836bf3d876f5a04ce28810c06045857bf46c3d0d31073b8aada5494" dependencies = [ - "ttf-parser", + "ttf-parser 0.24.1", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[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.7", - "indexmap 2.2.6", - "line-wrap", - "quick-xml", + "base64", + "indexmap 2.6.0", + "quick-xml 0.32.0", "serde", "time", ] [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2193,18 +2279,19 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] @@ -2216,9 +2303,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pretty" @@ -2233,9 +2323,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", @@ -2243,18 +2333,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -2286,20 +2376,83 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", ] [[package]] -name = "quote" -version = "1.0.35" +name = "quinn" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2316,6 +2469,8 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha", "rand_core", ] @@ -2334,12 +2489,15 @@ 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.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2357,18 +2515,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2377,33 +2535,139 @@ dependencies = [ [[package]] name = "reflexo" -version = "0.5.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247ea8050cb5c88b41a68b3269f5a2eb7ebff55851a564d96b035643418346e6" +version = "0.5.0-rc7" +source = "git+https://github.com/ParaN3xus/typst.ts?branch=tinymist-typst-0.12.0-rc2#2f5bcd35e03c269097636db5996e9f8ab0c831da" dependencies = [ - "base64 0.22.0", + "base64", "bitvec", "comemo", "dashmap", "ecow", "fxhash", - "once_cell", + "instant", "parking_lot", "path-clean", + "reflexo-typst-shim", "rkyv", + "rustc-hash", "serde", "serde_json", "serde_repr", "serde_with", - "siphasher 1.0.0", + "siphasher 1.0.1", "tiny-skia-path", ] +[[package]] +name = "reflexo-typst" +version = "0.5.0-rc7" +source = "git+https://github.com/ParaN3xus/typst.ts?branch=tinymist-typst-0.12.0-rc2#2f5bcd35e03c269097636db5996e9f8ab0c831da" +dependencies = [ + "codespan-reporting", + "comemo", + "ecow", + "futures", + "fxhash", + "indexmap 2.6.0", + "log", + "nohash-hasher", + "notify", + "parking_lot", + "pathdiff", + "rayon", + "reflexo", + "reflexo-typst2vec", + "reflexo-vfs", + "reflexo-world", + "serde", + "serde_json", + "tar", + "tokio", + "typst", +] + +[[package]] +name = "reflexo-typst-shim" +version = "0.5.0-rc7" +source = "git+https://github.com/ParaN3xus/typst.ts?branch=tinymist-typst-0.12.0-rc2#2f5bcd35e03c269097636db5996e9f8ab0c831da" +dependencies = [ + "cfg-if", + "typst", + "typst-syntax", +] + +[[package]] +name = "reflexo-typst2vec" +version = "0.5.0-rc7" +source = "git+https://github.com/ParaN3xus/typst.ts?branch=tinymist-typst-0.12.0-rc2#2f5bcd35e03c269097636db5996e9f8ab0c831da" +dependencies = [ + "bitvec", + "comemo", + "crossbeam-queue", + "dashmap", + "flate2", + "log", + "parking_lot", + "rayon", + "reflexo", + "rustc-hash", + "serde", + "serde_json", + "svgtypes 0.13.0", + "tiny-skia", + "tiny-skia-path", + "ttf-parser 0.24.1", + "typst", + "xmlparser", +] + +[[package]] +name = "reflexo-vfs" +version = "0.5.0-rc7" +source = "git+https://github.com/ParaN3xus/typst.ts?branch=tinymist-typst-0.12.0-rc2#2f5bcd35e03c269097636db5996e9f8ab0c831da" +dependencies = [ + "indexmap 2.6.0", + "log", + "nohash-hasher", + "parking_lot", + "reflexo", + "rpds", + "typst", +] + +[[package]] +name = "reflexo-world" +version = "0.5.0-rc7" +source = "git+https://github.com/ParaN3xus/typst.ts?branch=tinymist-typst-0.12.0-rc2#2f5bcd35e03c269097636db5996e9f8ab0c831da" +dependencies = [ + "chrono", + "codespan-reporting", + "comemo", + "dirs", + "ecow", + "flate2", + "fontdb 0.16.2", + "hex", + "log", + "parking_lot", + "reflexo", + "reflexo-typst-shim", + "reflexo-vfs", + "reqwest", + "serde", + "serde_json", + "serde_with", + "sha2", + "strum 0.25.0", + "tar", + "typst", +] + [[package]] name = "regex" -version = "1.10.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -2413,9 +2677,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -2424,9 +2688,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" @@ -2439,21 +2703,22 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ - "base64 0.21.7", + "base64", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -2463,13 +2728,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -2479,31 +2745,31 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", + "windows-registry", ] [[package]] name = "resvg" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" dependencies = [ - "gif 0.12.0", - "jpeg-decoder", + "gif", + "image-webp", "log", "pico-args", - "png", "rgb", - "svgtypes", + "svgtypes 0.15.2", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -2525,9 +2791,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -2543,9 +2809,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -2554,38 +2820,57 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + +[[package]] +name = "rpds" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0e15515d3ce3313324d842629ea4905c25a13f81953eadb88f85516f59290a4" +dependencies = [ + "archery", +] + +[[package]] +name = "rust_decimal" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +dependencies = [ + "arrayvec 0.7.6", + "num-traits", +] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2594,51 +2879,62 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ - "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.21.7", + "rustls-pki-types", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pki-types" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", - "ttf-parser", + "ttf-parser 0.24.1", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -2647,15 +2943,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[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" @@ -2668,11 +2958,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2681,16 +2971,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" @@ -2699,11 +2979,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2712,9 +2992,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2722,60 +3002,61 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2794,15 +3075,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ - "base64 0.21.7", + "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -2812,23 +3093,23 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "serde_yaml" -version = "0.9.33" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -2846,6 +3127,21 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + [[package]] name = "simd-adler32" version = "0.3.7" @@ -2854,15 +3150,15 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simplecss" @@ -2881,9 +3177,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -2905,15 +3201,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2933,15 +3229,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -2954,16 +3250,21 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.10.0" +name = "string-interner" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "serde", +] [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -2976,11 +3277,11 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros 0.26.2", + "strum_macros 0.26.4", ] [[package]] @@ -2993,40 +3294,51 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "subsetter" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" +checksum = "74f98178f34057d4d4de93d68104007c6dea4dfac930204a69ab4622daefa648" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svg2pdf" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" +checksum = "5014c9dadcf318fb7ef8c16438e95abcc9de1ae24d60d5bccc64c55100c50364" dependencies = [ + "fontdb 0.21.0", "image", + "log", "miniz_oxide", "once_cell", "pdf-writer", "resvg", + "siphasher 1.0.1", + "subsetter", "tiny-skia", + "ttf-parser 0.24.1", "usvg", ] @@ -3036,10 +3348,20 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" dependencies = [ - "kurbo", + "kurbo 0.9.5", "siphasher 0.3.11", ] +[[package]] +name = "svgtypes" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" +dependencies = [ + "kurbo 0.11.1", + "siphasher 1.0.1", +] + [[package]] name = "syn" version = "1.0.109" @@ -3053,9 +3375,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3064,9 +3386,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -3076,7 +3401,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -3101,27 +3426,6 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -3130,9 +3434,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -3141,14 +3445,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3161,39 +3466,36 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.58" +name = "thin-vec" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", + "syn 2.0.79", ] [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -3214,9 +3516,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -3229,7 +3531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if", "log", @@ -3250,9 +3552,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", "serde", @@ -3261,9 +3563,9 @@ dependencies = [ [[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", ] @@ -3276,17 +3578,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", + "mio 1.0.2", + "parking_lot", "pin-project-lite", + "signal-hook-registry", "socket2", - "windows-sys 0.48.0", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", ] [[package]] @@ -3301,33 +3617,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -3337,20 +3640,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -3359,9 +3662,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -3382,6 +3685,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "triomphe" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" + [[package]] name = "try-lock" version = "0.2.5" @@ -3395,10 +3704,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] -name = "two-face" -version = "0.3.0" +name = "ttf-parser" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] + +[[package]] +name = "two-face" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccd4843ea031c609fe9c16cae00e9657bad8a9f735a3cc2e420955d802b4268" dependencies = [ "once_cell", "serde", @@ -3419,18 +3737,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typst" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ce6533a33d2cc4b5eba6b009b862e75c8f9146a584f84ca154c94463e43993" +checksum = "87286a6b7e417426c425f35c42fb3d86e54ee99485b7eeb3662f4aeb569151c6" dependencies = [ + "arrayvec 0.7.6", "az", - "bitflags 2.4.2", + "bitflags 2.6.0", + "bumpalo", "chinese-number", "ciborium", "comemo", "csv", "ecow", - "fontdb", + "flate2", + "fontdb 0.21.0", "hayagriva", "hypher", "icu_properties", @@ -3440,9 +3761,9 @@ dependencies = [ "icu_segmenter", "if_chain", "image", - "indexmap 2.2.6", + "indexmap 2.6.0", "kamadak-exif", - "kurbo", + "kurbo 0.11.1", "lipsum", "log", "once_cell", @@ -3454,90 +3775,95 @@ dependencies = [ "rayon", "regex", "roxmltree", + "rust_decimal", "rustybuzz", "serde", "serde_json", "serde_yaml", - "siphasher 1.0.0", + "siphasher 1.0.1", "smallvec", "stacker", "syntect", "time", "toml", - "ttf-parser", + "ttf-parser 0.24.1", "two-face", "typed-arena", "typst-assets", "typst-macros", "typst-syntax", "typst-timing", + "typst-utils", "unicode-bidi", "unicode-math-class", "unicode-script", "unicode-segmentation", + "unscanny", "usvg", "wasmi", + "xmlwriter", ] [[package]] name = "typst-assets" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13f85360328da54847dd7fefaf272dfa5b6d1fdeb53f32938924c39bf5b2c6c" +checksum = "4fe00da1b24da2c4a7da532fc33d0c3bd43a902ca4c408ee2c36eabe70f2f4ba" [[package]] name = "typst-macros" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e48fdd6dabf48a0e595960aaef6ae43dac7d243e8c1c6926a0787d5b8a9ba7" +checksum = "17b8b94b63e868e969e372929d6d3efb0d5f8cedad95a4f3aa460959f4544e0d" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "typst-pdf" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c27957bbe3e17b961746a7ddf6f0831479674331457680bb8e3b84f7b83bd58" +checksum = "f8734aa2909d388486f58aba306711c6b916712bf09e11db05ca21ff5d712766" dependencies = [ - "base64 0.22.0", + "arrayvec 0.7.6", + "base64", "bytemuck", "comemo", "ecow", "image", + "indexmap 2.6.0", "miniz_oxide", "once_cell", "pdf-writer", + "serde", "subsetter", "svg2pdf", - "ttf-parser", + "ttf-parser 0.24.1", "typst", "typst-assets", "typst-macros", "typst-timing", - "unicode-properties", "unscanny", "xmp-writer", ] [[package]] name = "typst-render" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bcbc9a824c5e4d61327ec100e570d7ba03e3a29dcdb0a9736024a9b0e86594" +checksum = "4d70f981e0016722e9ec71ab087af057a29e622b604fcf471b0b453e2da2db04" dependencies = [ "bytemuck", "comemo", - "flate2", "image", "pixglyph", "resvg", "roxmltree", "tiny-skia", - "ttf-parser", + "ttf-parser 0.24.1", "typst", "typst-macros", "typst-timing", @@ -3546,13 +3872,15 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst?rev=d2afbb9a62436a20b507e833d70a2ddc77a00b74#d2afbb9a62436a20b507e833d70a2ddc77a00b74" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b7be8b6ed6b2cb39ca495947d548a28d7db0ba244008e44c5a759120327693" dependencies = [ - "comemo", "ecow", "once_cell", "serde", + "toml", + "typst-utils", "unicode-ident", "unicode-math-class", "unicode-script", @@ -3562,9 +3890,9 @@ dependencies = [ [[package]] name = "typst-timing" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2629933cde6f299c43627b90c83bb006cb906c56cc5dec7324f0a5017d5fd8" +checksum = "175e7755eca10fe7d5a37a54cff50fbdf1a1becd55f35330ab783f5317c9eb96" dependencies = [ "parking_lot", "serde", @@ -3573,86 +3901,26 @@ dependencies = [ ] [[package]] -name = "typst-ts-compiler" -version = "0.5.0-rc2" +name = "typst-utils" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18cf7d96c0c558901b3f7e3f5200ecb7e3d7d3dcc5a1222e94bc875237ff352" +checksum = "8f0305443ed97f0b658471487228f86bf835705e7525fbdcc671cebd864f7a40" dependencies = [ - "append-only-vec", - "base64 0.22.0", - "chrono", - "codespan-reporting", - "comemo", - "dirs", - "dissimilar", - "flate2", - "fontdb", - "fst", - "hex", - "indexmap 2.2.6", - "instant", - "log", - "nohash-hasher", - "notify", "once_cell", - "parking_lot", - "pathdiff", - "reqwest", - "rustc-hash", - "serde", - "serde_json", - "sha2", - "strum 0.25.0", - "tar", - "typst", - "typst-ts-core", - "walkdir", -] - -[[package]] -name = "typst-ts-core" -version = "0.5.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69135c380eb60efa4aeabd986d27d82ecd1b4c843fd3393992b449409317847" -dependencies = [ - "base64 0.22.0", - "base64-serde", - "bitvec", - "byteorder", - "comemo", - "crossbeam-queue", - "dashmap", - "ecow", - "elsa", - "flate2", - "fxhash", - "hex", - "log", - "once_cell", - "parking_lot", - "path-clean", + "portable-atomic", "rayon", - "reflexo", - "rustc-hash", - "serde", - "serde_json", - "serde_repr", - "serde_with", - "sha2", - "siphasher 1.0.0", - "tiny-skia", - "tiny-skia-path", - "ttf-parser", - "typst", - "xmlparser", + "siphasher 1.0.1", + "thin-vec", ] [[package]] name = "typstyle" -version = "0.11.16" +version = "0.12.0" dependencies = [ "anyhow", "clap", + "clap_complete", + "ecow", "insta", "itertools", "libtest-mimic", @@ -3660,13 +3928,16 @@ dependencies = [ "pathdiff", "pretty", "pretty_assertions", + "reflexo", + "reflexo-typst", + "reflexo-typst-shim", + "reflexo-vfs", + "reflexo-world", "typst", "typst-assets", "typst-pdf", "typst-render", "typst-syntax", - "typst-ts-compiler", - "typst-ts-core", "vergen", "walkdir", "wasm-bindgen", @@ -3674,18 +3945,18 @@ dependencies = [ [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -3693,36 +3964,33 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[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-math-class" @@ -3732,30 +4000,30 @@ checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -3765,9 +4033,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -3789,9 +4057,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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", @@ -3801,62 +4069,29 @@ dependencies = [ [[package]] name = "usvg" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ + "base64", "data-url", "flate2", + "fontdb 0.21.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", + "pico-args", "roxmltree", - "simplecss", - "siphasher 0.3.11", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" -dependencies = [ - "fontdb", - "kurbo", - "log", "rustybuzz", + "simplecss", + "siphasher 1.0.1", + "strict-num", + "svgtypes 0.15.2", + "tiny-skia-path", "unicode-bidi", "unicode-script", "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" -dependencies = [ - "strict-num", - "svgtypes", - "tiny-skia-path", + "xmlwriter", ] [[package]] @@ -3867,15 +4102,15 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[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.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "vcpkg" @@ -3885,9 +4120,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.3.1" +version = "8.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cargo_metadata", @@ -3901,9 +4136,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3932,34 +4167,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3969,9 +4205,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3979,47 +4215,56 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasmi" -version = "0.31.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +checksum = "dbaac6e702fa7b52258e5ac90d6e20a40afb37a1fbe7c645d0903ee42c5f85f4" dependencies = [ + "arrayvec 0.7.6", + "multi-stash", + "num-derive", + "num-traits", "smallvec", "spin", - "wasmi_arena", + "wasmi_collections", "wasmi_core", "wasmparser-nostd", ] [[package]] -name = "wasmi_arena" -version = "0.4.1" +name = "wasmi_collections" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +checksum = "8ff59e30e550a509cc689ec638e5042be4d78ec9f6dd8a71fd02ee28776a74fd" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.14.5", + "string-interner", +] [[package]] name = "wasmi_core" -version = "0.13.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +checksum = "13e10c674add0f92f47bf8ad57c55ee3ac1762a0d9baf07535e27e22b758a916" dependencies = [ "downcast-rs", "libm", @@ -4029,18 +4274,18 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -4048,9 +4293,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" @@ -4058,44 +4306,52 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4113,7 +4369,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4133,17 +4398,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.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]] @@ -4154,9 +4420,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4166,9 +4432,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4178,9 +4444,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +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" @@ -4190,9 +4462,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4202,9 +4474,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4214,9 +4486,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4226,34 +4498,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "writeable" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wyz" @@ -4289,9 +4551,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" +checksum = "8254499146a4fd0c86e3e99cf4a9f468f595808fb49ff8f3e495f2b117bf4ebc" [[package]] name = "yaml-rust" @@ -4304,15 +4566,15 @@ 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 = "yoke" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ "serde", "stable_deref_trait", @@ -4322,42 +4584,69 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", "synstructure", ] [[package]] -name = "zerofrom" -version = "0.1.3" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", "synstructure", ] [[package]] -name = "zerotrie" -version = "0.1.2" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" dependencies = [ "displaydoc", "litemap", @@ -4367,9 +4656,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ "serde", "yoke", @@ -4379,11 +4668,26 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix index 2a35cf3c8f..cbd73dfc8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix @@ -13,16 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.35"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-mPppnbgTXJ4ALIHrI0q9UpwGPDoTGitw5KRY8eA/vJg="; + hash = "sha256-jrhxOtaawZ2vCiK8BQ9G09HTC5F6cnEK/Ji567xYfXw="; }; - cargoHash = "sha256-30xinYXS+OGYE1H0Eutwpjgn3OfFtjTUJInDHvn6/E0="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "reflexo-0.5.0-rc7" = "sha256-XjzHo9HprI1FVPDwNQ0Gw9iTXspo6PUsxz3BOd6qkL0="; + }; + }; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix index 5bcf16fdd8..19dbe22d98 100644 --- a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix @@ -4,9 +4,11 @@ rustPlatform, fetchFromGitHub, pkg-config, - audioSupport ? true, + darwin, + audioSupport ? true, alsa-lib, + webcamSupport ? false, # passthru.tests.run runCommand, @@ -30,7 +32,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4XHKcmOeaeSGfl7uvQQdhm29DBWEdZLX021d9+Ebrww="; nativeBuildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ] + lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ] ++ lib.optionals audioSupport [ pkg-config ]; buildInputs = @@ -41,7 +43,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (audioSupport && stdenv.hostPlatform.isDarwin) [ AudioUnit ] ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ]; - buildFeatures = lib.optional audioSupport "audio"; + buildFeatures = lib.optional audioSupport "audio" ++ lib.optional webcamSupport "webcam"; passthru.updateScript = ./update.sh; passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock index 590eb84c8e..066981fdff 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -89,9 +83,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arrayref" @@ -160,9 +154,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.13" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "bzip2", "flate2", @@ -229,9 +223,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axoasset" @@ -314,7 +308,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -407,9 +401,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -425,9 +419,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -499,9 +493,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.19" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", @@ -559,9 +553,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -569,9 +563,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -582,9 +576,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.26" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" dependencies = [ "clap", ] @@ -602,9 +596,9 @@ dependencies = [ [[package]] name = "clap_complete_nushell" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" +checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677" dependencies = [ "clap", "clap_complete", @@ -847,7 +841,7 @@ version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.29.0", + "nix", "windows-sys 0.59.0", ] @@ -1052,9 +1046,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -1085,7 +1079,7 @@ checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-ng-sys", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1290,9 +1284,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1411,12 +1405,12 @@ dependencies = [ [[package]] name = "homedir" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bed305c13ce3829a09d627f5d43ff738482a09361ae4eb8039993b55fb10e5e" +checksum = "5bdbbd5bc8c5749697ccaa352fa45aff8730cf21c68029c0eef1ffed7c3d6ba2" dependencies = [ "cfg-if", - "nix 0.26.4", + "nix", "widestring", "windows 0.57.0", ] @@ -1466,15 +1460,15 @@ dependencies = [ [[package]] name = "http-content-range" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" +checksum = "aa7929c876417cd3ece616950474c7dff5b0150a2b53bd7e7fda55afa086c22b" [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1484,9 +1478,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1644,9 +1638,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1747,9 +1741,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1806,9 +1800,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libmimalloc-sys" @@ -1828,7 +1822,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -1945,15 +1939,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "miette" version = "7.2.0" @@ -2008,16 +1993,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2025,6 +2000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2077,19 +2053,6 @@ dependencies = [ "rand", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - [[package]] name = "nix" version = "0.29.0" @@ -2154,18 +2117,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -2246,7 +2209,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -2265,9 +2228,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "percent-encoding" @@ -2277,9 +2240,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -2288,9 +2251,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -2298,9 +2261,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", @@ -2311,9 +2274,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -2338,18 +2301,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", @@ -2376,9 +2339,9 @@ checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -2398,15 +2361,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -2420,9 +2383,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "ppv-lite86" @@ -2475,9 +2438,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560bcab673ff7f6ca9e270c17bf3affd8a05e3bd9207f123b0d45076fd8197e8" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ "autocfg", "equivalent", @@ -2486,9 +2449,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -2516,7 +2479,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c" +source = "git+https://github.com/astral-sh/pubgrub?rev=7243f4faf8e54837aa8a401a18406e7173de4ad5#7243f4faf8e54837aa8a401a18406e7173de4ad5" dependencies = [ "indexmap", "log", @@ -2673,9 +2636,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -2748,9 +2711,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c1f1959e4db12c985c0283656be0925f1539549db1e47c4bd0b8b599e1ef7" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" dependencies = [ "bytecheck", ] @@ -2767,6 +2730,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "http-body-util", @@ -2807,7 +2771,7 @@ dependencies = [ [[package]] name = "reqwest-middleware" version = "0.3.3" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", @@ -2821,7 +2785,7 @@ dependencies = [ [[package]] name = "reqwest-retry" version = "0.7.1" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", @@ -2974,8 +2938,7 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-netrc" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32662f97cbfdbad9d5f78f1338116f06871e7dae4fd37e9f59a0f57cf2044868" +source = "git+https://github.com/gribouille/netrc?rev=544f3890b621f0dc30fcefb4f804269c160ce2e9#544f3890b621f0dc30fcefb4f804269c160ce2e9" dependencies = [ "thiserror", ] @@ -3007,9 +2970,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "once_cell", "ring", @@ -3034,19 +2997,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -3092,9 +3054,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -3171,9 +3133,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3229,9 +3191,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3241,9 +3203,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3309,9 +3271,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" @@ -3460,9 +3422,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -3975,9 +3937,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicase" @@ -3990,9 +3952,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -4026,18 +3988,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-vo" @@ -4047,9 +4009,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unscanny" @@ -4128,13 +4090,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uv" -version = "0.4.20" +version = "0.4.25" dependencies = [ "anstream", "anyhow", @@ -4144,6 +4106,7 @@ dependencies = [ "base64 0.22.1", "byteorder", "clap", + "console", "ctrlc", "etcetera", "filetime", @@ -4187,6 +4150,7 @@ dependencies = [ "uv-cli", "uv-client", "uv-configuration", + "uv-console", "uv-dispatch", "uv-distribution", "uv-distribution-filename", @@ -4210,8 +4174,10 @@ dependencies = [ "uv-scripts", "uv-settings", "uv-shell", + "uv-static", "uv-tool", "uv-types", + "uv-version", "uv-virtualenv", "uv-warnings", "uv-workspace", @@ -4240,6 +4206,7 @@ dependencies = [ "url", "urlencoding", "uv-once-map", + "uv-static", "wiremock", ] @@ -4294,7 +4261,6 @@ dependencies = [ "uv-pep508", "uv-pubgrub", "uv-pypi-types", - "uv-version", "uv-warnings", "walkdir", "zip", @@ -4321,12 +4287,14 @@ dependencies = [ "toml_edit", "tracing", "uv-configuration", + "uv-distribution", "uv-distribution-types", "uv-fs", "uv-pep440", "uv-pep508", "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-virtualenv", ] @@ -4352,6 +4320,7 @@ dependencies = [ "uv-fs", "uv-normalize", "uv-pypi-types", + "uv-static", "walkdir", ] @@ -4399,6 +4368,7 @@ dependencies = [ "uv-python", "uv-resolver", "uv-settings", + "uv-static", "uv-version", "uv-warnings", ] @@ -4450,6 +4420,7 @@ dependencies = [ "uv-pep508", "uv-platform-tags", "uv-pypi-types", + "uv-static", "uv-version", "uv-warnings", ] @@ -4478,6 +4449,7 @@ dependencies = [ "uv-pep508", "uv-platform-tags", "uv-pypi-types", + "uv-static", "which", ] @@ -4525,6 +4497,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-settings", + "uv-static", "uv-workspace", "walkdir", ] @@ -4618,6 +4591,7 @@ name = "uv-distribution-types" version = "0.0.1" dependencies = [ "anyhow", + "bitflags 2.6.0", "fs-err", "itertools 0.13.0", "jiff", @@ -4630,6 +4604,7 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-auth", "uv-cache-info", "uv-cache-key", "uv-distribution-filename", @@ -4707,6 +4682,8 @@ dependencies = [ "uv-auth", "uv-cache-key", "uv-fs", + "uv-static", + "which", ] [[package]] @@ -4777,6 +4754,7 @@ dependencies = [ "uv-platform-tags", "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-warnings", "walkdir", @@ -4937,6 +4915,7 @@ dependencies = [ "uv-fs", "uv-metadata", "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -5010,6 +4989,7 @@ dependencies = [ "uv-platform-tags", "uv-pypi-types", "uv-state", + "uv-static", "uv-warnings", "which", "windows-registry", @@ -5128,6 +5108,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-requirements-txt", + "uv-static", "uv-types", "uv-warnings", "uv-workspace", @@ -5143,6 +5124,7 @@ dependencies = [ "serde", "thiserror", "toml", + "uv-distribution-types", "uv-pep440", "uv-pep508", "uv-pypi-types", @@ -5176,6 +5158,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-resolver", + "uv-static", "uv-warnings", ] @@ -5188,6 +5171,7 @@ dependencies = [ "same-file", "tracing", "uv-fs", + "uv-static", "winreg", ] @@ -5201,6 +5185,10 @@ dependencies = [ "tempfile", ] +[[package]] +name = "uv-static" +version = "0.0.1" + [[package]] name = "uv-tool" version = "0.0.1" @@ -5223,6 +5211,7 @@ dependencies = [ "uv-python", "uv-settings", "uv-state", + "uv-static", "uv-virtualenv", ] @@ -5248,7 +5237,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.20" +version = "0.4.25" [[package]] name = "uv-virtualenv" @@ -5292,7 +5281,6 @@ dependencies = [ "same-file", "schemars", "serde", - "serde-untagged", "tempfile", "thiserror", "tokio", @@ -5300,6 +5288,7 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-distribution-types", "uv-fs", "uv-git", "uv-macros", @@ -5308,6 +5297,7 @@ dependencies = [ "uv-pep440", "uv-pep508", "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -5359,9 +5349,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -5370,9 +5360,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -5385,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -5397,9 +5387,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5407,9 +5397,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -5420,15 +5410,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5454,9 +5444,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -5464,9 +5454,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -5518,7 +5508,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5805,9 +5795,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix index 9ac434f41c..90da34f6d6 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix @@ -15,22 +15,23 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.20"; + version = "0.4.25"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-PfjYGCPPRZVm4H9oxkWdjW7kHu4CqdkenFgL61dOU5k="; + hash = "sha256-qAfM9I2NboYkUukWnOjuGcdjp8IONAI6Qwwg1r9kCGg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; - "pubgrub-0.2.1" = "sha256-pU+F6hwqy+r6tz5OBoB6gU0+vdH6F3ikUaPrcvYRX2c="; - "reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ="; + "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY="; + "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM="; + "rust-netrc-0.1.1" = "sha256-DeDAm2k4/2A9Nw8zXeKOMdxhbseGIrRXH0KgGf2shOc="; "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix b/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix index 3c59df5164..a9ea0aeda8 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { pname = "valuta"; - version = "1.2.0"; + version = "1.3.2"; pyproject = false; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { owner = "ideveCore"; repo = "Valuta"; rev = "v${version}"; - hash = "sha256-ygroF9hlmsjQTocly7CNL6zQi4N6h8va/ZkJ8w8QHms="; + hash = "sha256-g2x+pqs7dXdTMSxzSU5TeQtE+Q+tdQ93xaMtUVEE5/U="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + babel dbus-python pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix index 7ca50671c4..58b5d8da8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname src; - hash = "sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8="; + hash = "sha256-YBWe4MEmFu8cksOIxuTK0deO7q0QuqgOUc9WkUNBwp0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix index 0702a9d114..febb85b3c9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, pkg-config, + installShellFiles, dbus, stdenv, darwin, @@ -10,20 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "veryl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${version}"; - hash = "sha256-U4ikR2jRmHUwRycAL/t2XJtvHQniKu6skRKWn8XDIgM="; + hash = "sha256-YcYP7JO27Fv/LTrxbQ0vNqwBE6anGjeTFS31MAp2ip4="; fetchSubmodules = true; }; - cargoHash = "sha256-t2q3rbY84+0ayxt7a/TCD0exCm7KEs+8UbQjCtqZPoE="; + cargoHash = "sha256-HvT56jBmFTWUdzHjyPVaJ3wuMD01omCFEIEJ53JrKY4="; nativeBuildInputs = [ pkg-config + installShellFiles ]; buildInputs = @@ -37,6 +39,13 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd veryl \ + --bash <($out/bin/veryl metadata --completion bash) \ + --fish <($out/bin/veryl metadata --completion fish) \ + --zsh <($out/bin/veryl metadata --completion zsh) + ''; + checkFlags = [ # takes over an hour "--skip=tests::progress" @@ -53,7 +62,6 @@ rustPlatform.buildRustPackage rec { "--skip=analyzer::test_68_std" "--skip=emitter::test_25_dependency" "--skip=emitter::test_68_std" - ]; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix index 4979bd32bd..bfe9354534 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-rizJu6v04wFEpJtakC2tfPg/uylz7gAOzJiXvUwdDI4="; + hash = "sha256-BOVjbaDbZw6H6X8o945M0Bx6fqnRQjFBviOLkTYVJ1I="; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix index a62595242c..150b1abc8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix @@ -17,7 +17,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-pp4AZnoI7gON/meZalfXmaliKR/wSjkj9GTX3My678s="; + hash = "sha256-D2dOyYsdsNV1ZSQdjpy6rfoix7yBACEHj/2XyHb7HWE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/vi/virt-v2v/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/virt-v2v/package.nix new file mode 100644 index 0000000000..4d6ce4e63f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vi/virt-v2v/package.nix @@ -0,0 +1,106 @@ +{ + stdenv, + lib, + testers, + fetchurl, + pkg-config, + makeWrapper, + autoreconfHook, + bash-completion, + OVMF, + qemu, + ocamlPackages, + perl, + cpio, + getopt, + libosinfo, + pcre2, + libxml2, + jansson, + glib, + libguestfs-with-appliance, + cdrkit, + nbdkit, + withWindowsGuestSupport ? true, + pkgsCross, # for rsrvany + virtio-win, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "virt-v2v"; + version = "2.6.0"; + + src = fetchurl { + url = "https://download.libguestfs.org/virt-v2v/${lib.versions.majorMinor finalAttrs.version}-stable/virt-v2v-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-W7t/n1QO9UebyH85abtnSY5i7kH/6h8JIAlFQoD1vkU="; + }; + + postPatch = '' + substituteInPlace common/mlv2v/uefi.ml \ + --replace-fail '/usr/share/OVMF/OVMF_CODE.fd' "${OVMF.firmware}" \ + --replace-fail '/usr/share/OVMF/OVMF_VARS.fd' "${OVMF.variables}" + + patchShebangs . + ''; + + nativeBuildInputs = + [ + pkg-config + autoreconfHook + makeWrapper + bash-completion + perl + libguestfs-with-appliance + qemu + cpio + cdrkit + getopt + ] + ++ (with ocamlPackages; [ + ocaml + findlib + ]); + + buildInputs = + [ + libosinfo + pcre2 + libxml2 + jansson + glib + ] + ++ (with ocamlPackages; [ + ocaml_libvirt + nbd + ]); + + postInstall = + '' + for bin in $out/bin/*; do + wrapProgram "$bin" \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + nbdkit + qemu + ] + }" + done + '' + + lib.optionalString withWindowsGuestSupport '' + ln -s "${virtio-win}" $out/share/virtio-win + ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools + ''; + + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + + meta = { + homepage = "https://github.com/libguestfs/virt-v2v"; + description = "Convert guests from foreign hypervisors to run on KVM"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lukts30 ]; + platforms = lib.platforms.linux; + mainProgram = "virt-v2v"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/vivictpp/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vivictpp/package.nix similarity index 85% rename from third_party/nixpkgs/pkgs/applications/video/vivictpp/default.nix rename to third_party/nixpkgs/pkgs/by-name/vi/vivictpp/package.nix index 114718177a..5dd777995b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vivictpp/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/vivictpp/package.nix @@ -4,10 +4,11 @@ , SDL2, SDL2_ttf , freetype, harfbuzz , ffmpeg -, cacert }: +, cacert +, zlib }: let - version = "1.0.0"; + version = "1.1.0"; withSubprojects = stdenv.mkDerivation { name = "sources-with-subprojects"; @@ -15,7 +16,7 @@ let owner = "vivictorg"; repo = "vivictpp"; rev = "v${version}"; - hash = "sha256-dCtMjemEjXe63ELAfQhzJl3GecqWLcjL2y5Htn6hYgU="; + hash = "sha256-ScuCOmcK714YXEHncizwj6EWdiNIJA1xRMn5gfmg4K4="; }; nativeBuildInputs = [ @@ -33,9 +34,9 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-a7NBQJt5T+KwP8Djc8TQiVLNZF8UcXlXrv2G/dZ54aM="; + outputHash = "sha256-/6nuTKjQEXfJlHkTkeX/A4PeGb8SOk6Q801gjx1SB6M="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "vivictpp"; inherit version; @@ -57,6 +58,7 @@ in stdenv.mkDerivation rec { freetype harfbuzz ffmpeg + zlib ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/by-name/vt/vt323/package.nix b/third_party/nixpkgs/pkgs/by-name/vt/vt323/package.nix new file mode 100644 index 0000000000..865b11b077 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vt/vt323/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ... +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vt323"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "phoikoi"; + repo = "VT323"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Abq0/hU/BXJMxQxzhZG1SEGIZYt+qofuXwy5/A9byQ8="; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp fonts/ttf/VT323-Regular.ttf $out/share/fonts/truetype + ''; + + meta = { + changelog = "https://github.com/phoikoi/VT323/releases/tag/v${finalAttrs.version}"; + description = "Monospaced typeface designed to look like the VT320 text terminal glyphs"; + homepage = "https://github.com/phoikoi/VT323"; + license = with lib.licenses; [ ofl ]; + maintainers = with lib.maintainers; [ marcel ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/vym/default.nix b/third_party/nixpkgs/pkgs/by-name/vy/vym/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/applications/misc/vym/default.nix rename to third_party/nixpkgs/pkgs/by-name/vy/vym/package.nix index 8a550ac4a7..bafae7dad5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vym/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/vy/vym/package.nix @@ -1,17 +1,23 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, pkg-config -, qtbase -, qtscript -, qtsvg -, substituteAll -, unzip -, wrapQtAppsHook -, zip +{ + lib, + cmake, + fetchFromGitHub, + pkg-config, + qt5, + stdenv, + substituteAll, + unzip, + zip, }: +let + inherit (qt5) + qtbase + qtscript + qtsvg + wrapQtAppsHook + ; +in stdenv.mkDerivation (finalAttrs: { pname = "vym"; version = "2.9.26"; @@ -23,13 +29,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ (substituteAll { - src = ./000-fix-zip-paths.diff; - zipPath = "${zip}/bin/zip"; - unzipPath = "${unzip}/bin/unzip"; + src = ./patches/0000-fix-zip-paths.diff; + zipPath = "${lib.getExe zip}"; + unzipPath = "${lib.getExe unzip}"; }) ]; @@ -45,16 +54,20 @@ stdenv.mkDerivation (finalAttrs: { qtsvg ]; - strictDeps = true; - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + unzip + zip + ] + }" ]; + strictDeps = true; + meta = { homepage = "http://www.insilmaril.de/vym/"; description = "Mind-mapping software"; - mainProgram = "vym"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. Such maps can help you to improve your creativity and @@ -67,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { work with such maps. ''; license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "vym"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/vym/000-fix-zip-paths.diff b/third_party/nixpkgs/pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/vym/000-fix-zip-paths.diff rename to third_party/nixpkgs/pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json index acd09406fe..bc420f89b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-LPH9JbOXOBjT4vMWNGMvQYDVnTE6p2tFTlOe8HOFsk0=", - "version": "0.2024.10.08.08.02.stable_02" + "hash": "sha256-6cPn6ukGPpEdzCcENGUT5h+UPSo8rrEZEjeLEHJTG/4=", + "version": "0.2024.10.15.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-jwbwRgQ7WR04zCki7PQuuMZD7v2tFl3Gm1olZ28FAp8=", - "version": "0.2024.10.08.08.02.stable_02" + "hash": "sha256-ftTBelAaGWxrOlpDGtEeNT9GjtS4XZdvzUsWxEnrGzs=", + "version": "0.2024.10.15.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-Ticn8OMYHWQT88WQSpgcT/kBVnHyoDHNhTk0m4T45bQ=", - "version": "0.2024.10.08.08.02.stable_02" + "hash": "sha256-y7oSCc+bsRj7BSF8MiYpNJ73M5xBBTIRhotHdRPsfqk=", + "version": "0.2024.10.15.08.02.stable_03" } } diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix index 9d13d24abd..7f762178a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.8.10"; + version = "0.8.12"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-jhXHuzHMwo9U5B+FA2xAreOYRVroMCXqDo+9pjAyh0Q="; - aarch64-linux = "sha256-JnKkjG67uvYNod+uosJ+svTAm9bulJzTpza3jQie1yQ="; - x86_64-darwin = "sha256-Dk/pKZrqkjKc7WEGkrLdZdgUEaz8ndXjZuINyVNxEa8="; - aarch64-darwin = "sha256-FgBbUrp+Z9K4gmM4mew0NQ2yIjuC+cgYrrYkjv0Ohhg="; + x86_64-linux = "sha256-lk+YBlsgS2kOsaesKJ0XMCnbxq5iza/0xG6qWjHLZA8="; + aarch64-linux = "sha256-57j5qp/1jGiqJP6Qmfw5XkoyXkNpnaTepfhSzlISExM="; + x86_64-darwin = "sha256-jBFkBC4PcWSQNw8A2w+2iUnSLoRvXQ3A0CVqkqfx4dI="; + aarch64-darwin = "sha256-pQ3TXKhiCI164qmmDkDFb3WUjd/lX1MnAOWqsQICHR4="; }; in fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh index 7950a65e8d..d56927f60b 100755 --- a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts +#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts latestTag=$(curl https://api.github.com/repos/wavetermdev/waveterm/releases/latest | jq -r ".tag_name") latestVersion="$(expr "$latestTag" : 'v\(.*\)')" @@ -19,7 +19,6 @@ for i in \ "aarch64-darwin Wave-darwin-arm64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip") - hash=$(nix-hash --type sha256 --to-sri $prefetch) - + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/third_party/nixpkgs/pkgs/applications/misc/waycorner/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waycorner/package.nix similarity index 69% rename from third_party/nixpkgs/pkgs/applications/misc/waycorner/default.nix rename to third_party/nixpkgs/pkgs/by-name/wa/waycorner/package.nix index 2d1303bb26..6be599fbd9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waycorner/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/waycorner/package.nix @@ -1,41 +1,45 @@ -{ lib -, makeWrapper -, rustPlatform -, pkg-config -, fetchFromGitHub -, wayland -, +{ + lib, + makeWrapper, + rustPlatform, + pkg-config, + fetchFromGitHub, + wayland, + gitUpdater, }: rustPlatform.buildRustPackage rec { pname = "waycorner"; version = "0.2.3"; + src = fetchFromGitHub { owner = "AndreasBackx"; repo = "waycorner"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y="; }; + cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU="; - buildInputs = [ - wayland - ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + postFixup = '' # the program looks for libwayland-client.so at runtime wrapProgram $out/bin/waycorner \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]} ''; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Hot corners for Wayland"; mainProgram = "waycorner"; - changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md"; + changelog = "https://github.com/AndreasBackx/waycorner/blob/${version}/CHANGELOG.md"; homepage = "https://github.com/AndreasBackx/waycorner"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ NotAShelf ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NotAShelf ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix b/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix index 690eba3a3b..88133c882c 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix @@ -44,8 +44,12 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; - # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 - pythonRelaxDeps = [ "rapidfuzz" ]; + pythonRelaxDeps = [ + # https://github.com/WeblateOrg/weblate/commit/9695f912b0d24ae999d9442bb49719b4bb552696 + "qrcode" + # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 + "rapidfuzz" + ]; patches = [ # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix index aad6ed2b40..dde65d9f9f 100644 --- a/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "whatsie"; - version = "4.16.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "keshavbhatt"; repo = "whatsie"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-+sbnpaR+pR5aKbGUIVM3yRpco7/jE9LkCbQKrgFDYwM="; + hash = "sha256-9G+2yYc5Lcmw5NvLnn7jVZ4Fw79L29KbhiE2CYh6SLM="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windmill/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wi/windmill/Cargo.lock index ee654eade4..89bed47aa1 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windmill/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/wi/windmill/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -27,6 +27,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.7.5" @@ -34,22 +40,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures", -] - [[package]] name = "ahash" version = "0.7.8" @@ -68,6 +63,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom 0.2.15", "once_cell", "version_check", @@ -121,9 +117,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -136,33 +132,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -170,31 +166,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] -name = "archiver-rs" -version = "0.5.1" -source = "git+https://github.com/gz/archiver-rs.git?branch=patch-1#a73cef92c2a5b8f48c2a4a9e889952072e03b4b7" -dependencies = [ - "bzip2", - "flate2", - "tar", - "thiserror", - "xz2", - "zip", -] - -[[package]] -name = "argminmax" -version = "0.6.2" +name = "arc-swap" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" -dependencies = [ - "num-traits", -] +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" @@ -205,7 +185,7 @@ dependencies = [ "base64ct", "blake2", "cpufeatures", - "password-hash 0.5.0", + "password-hash", ] [[package]] @@ -224,27 +204,244 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc" [[package]] -name = "array-init-cursor" -version = "0.2.0" +name = "arrayref" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "arrow" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-csv", + "arrow-data", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", +] + +[[package]] +name = "arrow-arith" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" +dependencies = [ + "ahash 0.8.11", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "chrono-tz 0.9.0", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "atoi", + "base64 0.22.1", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-csv" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13c36dc5ddf8c128df19bab27898eea64bf9da2b555ec1cd17a8ff57fba9ec2" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-data" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "flatbuffers", + "lz4_flex", +] + +[[package]] +name = "arrow-json" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb22284c5a2a01d73cebfd88a33511a3234ab45d66086b2ca2d1228c3498e445" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "indexmap 2.6.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" +dependencies = [ + "ahash 0.8.11", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "half", +] + +[[package]] +name = "arrow-schema" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" + +[[package]] +name = "arrow-select" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" +dependencies = [ + "ahash 0.8.11", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + +[[package]] +name = "arrow-string" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "memchr", + "num", + "regex", + "regex-syntax 0.8.5", +] [[package]] name = "ast_node" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e521452c6bce47ee5a5461c5e5d707212907826de14124962c58fcaf463115e" +checksum = "f9184f2b369b3e8625712493c89b785881f27eedc6cde480a81883cef78868b2" dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -265,7 +462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -289,27 +486,32 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.10" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e" dependencies = [ - "brotli 6.0.0", + "brotli 7.0.0", + "bzip2", "flate2", "futures-core", + "futures-io", "memchr", "pin-project-lite", "tokio", + "xz2", + "zstd 0.13.2", + "zstd-safe 7.2.1", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -322,8 +524,8 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel 2.3.1", "async-executor", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io", + "async-lock", "blocking", "futures-lite 2.3.0", "once_cell", @@ -331,60 +533,31 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" 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.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -398,7 +571,7 @@ dependencies = [ "bytes", "http 1.1.0", "rand 0.8.5", - "reqwest 0.12.4", + "reqwest 0.12.8", "serde", "serde-aux", "serde_json", @@ -415,24 +588,24 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "async-std" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" dependencies = [ "async-channel 1.9.0", "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 1.13.0", + "futures-lite 2.3.0", "gloo-timers", "kv-log-macro", "log", @@ -446,9 +619,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -457,13 +630,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -477,7 +650,7 @@ dependencies = [ "hex", "hmac", "http-types", - "hyper 0.14.28", + "hyper 0.14.31", "hyper-tls 0.5.0", "serde", "serde_json", @@ -499,13 +672,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -545,12 +718,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atoi_simd" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" - [[package]] name = "atomic-waker" version = "1.1.2" @@ -559,15 +726,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.4.0" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ddbfb5db93d62521f47b3f223da0884a2f02741ff54cb9cda192a0e73ba08b" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -582,10 +749,9 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "http 0.2.12", - "hyper 0.14.28", "ring 0.17.8", "time", "tokio", @@ -596,9 +762,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -608,32 +774,34 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.2.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75588e7ee5e8496eed939adac2035a6dbab9f7eb2acdd9ab2d31856dab6f3955" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-async", "aws-smithy-http", + "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", + "once_cell", "percent-encoding", "pin-project-lite", "tracing", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] name = "aws-sdk-sso" -version = "1.25.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef2d9ca2b43051224ed326ed9960a85e277b7d554a2cd0397e57c0553d86e64" +checksum = "0dc2faec3205d496c7e57eff685dd944203df7ce16a4116d0281c44021788a7b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -653,9 +821,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.26.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c869d1f5c4ee7437b79c3c1664ddbf7a60231e893960cf82b2b299a5ccf2cc5d" +checksum = "c93c241f52bc5e0476e259c953234dab7e2a35ee207ee202e86c0095ec4951dc" dependencies = [ "aws-credential-types", "aws-runtime", @@ -675,9 +843,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.25.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2b4a632a59e4fab7abf1db0d94a3136ad7871aba46bebd1fdb95c7054afcdb" +checksum = "b259429be94a3459fa1b00c5684faee118d74f9577cc50aebadc36e507c63b5f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -698,9 +866,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -732,9 +900,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.8" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", @@ -771,22 +939,23 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.5.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ac79e9f3a4d576f3cd4a470a0275b138d9e7b11b1cd514a6858ae0a79dd5bb" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "http-body 1.0.0", - "hyper 0.14.28", - "hyper-rustls", + "http-body 1.0.1", + "httparse", + "hyper 0.14.31", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", @@ -797,9 +966,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ec42c2f5c0e7796a2848dde4d9f3bf8ce12ccbb3d5aa40c52fa0cdd61a1c47" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -814,9 +983,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.9" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf98d97bba6ddaba180f1b1147e202d8fe04940403a95a3f826c790f931bbd1" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd 0.8.0", "bytes", @@ -825,7 +994,7 @@ dependencies = [ "http 0.2.12", "http 1.1.0", "http-body 0.4.6", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "itoa", "num-integer", @@ -840,42 +1009,41 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.8" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.2.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a807d90cd50a969b3d95e4e7ad1491fcae13c6e83948d8728363ecc09d66343a" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http 0.2.12", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "tracing", ] [[package]] name = "axum" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" dependencies = [ "async-trait", "axum-core", "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.5.0", "hyper-util", "itoa", "matchit", @@ -891,7 +1059,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -899,20 +1067,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -920,17 +1088,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -939,6 +1107,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base32" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "022dfe9eb35f19ebbcb51e0b40a5ab759f46ad60cadf7297e0bd085afb50e076" + [[package]] name = "base64" version = "0.13.1" @@ -984,12 +1158,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bb8" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7c2093d15d6a1d33b1f972e1c5ea3177748742b97a5f392aa83a65262c6780" +checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" dependencies = [ "async-trait", - "futures-channel", "futures-util", "parking_lot", "tokio", @@ -997,29 +1170,18 @@ dependencies = [ [[package]] name = "better_scoped_tls" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" +checksum = "297b153aa5e573b5863108a6ddc9d5c968bd0b20e75cc614ee9821d2f45679c7" dependencies = [ "scoped-tls", ] [[package]] name = "bigdecimal" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "bigdecimal" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9324c8014cd04590682b34f1e9448d38f0674d0f7b2dc553331016ef0e4e9ebc" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ "autocfg", "libm", @@ -1039,27 +1201,45 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", "lazy_static", "lazycell", "log", - "prettyplease 0.2.20", + "prettyplease 0.2.24", "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.65", + "syn 2.0.81", "which 4.4.2", ] +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.81", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -1083,13 +1263,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] +[[package]] +name = "bitpacking" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" +dependencies = [ + "crunchy", +] + [[package]] name = "bitvec" version = "1.0.1" @@ -1111,6 +1300,19 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -1137,7 +1339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" dependencies = [ "block-padding", - "cipher 0.3.0", + "cipher", ] [[package]] @@ -1148,12 +1350,11 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel 2.3.1", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -1162,9 +1363,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ "borsh-derive", "cfg_aliases", @@ -1172,29 +1373,18 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", "syn_derive", ] -[[package]] -name = "brotli" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor 2.5.1", -] - [[package]] name = "brotli" version = "6.0.0" @@ -1203,24 +1393,25 @@ checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", - "brotli-decompressor 4.0.0", + "brotli-decompressor", ] [[package]] -name = "brotli-decompressor" -version = "2.5.1" +name = "brotli" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", + "brotli-decompressor", ] [[package]] name = "brotli-decompressor" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1250,6 +1441,9 @@ name = "bumpalo" version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +dependencies = [ + "allocator-api2", +] [[package]] name = "bytecheck" @@ -1275,22 +1469,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -1301,9 +1495,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1345,7 +1539,7 @@ dependencies = [ "byteorder", "gemm", "half", - "memmap2 0.9.4", + "memmap2", "num-traits", "num_cpus", "rand 0.8.5", @@ -1405,15 +1599,21 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] +[[package]] +name = "census" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" + [[package]] name = "cexpr" version = "0.6.0" @@ -1431,9 +1631,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -1447,18 +1647,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", -] - -[[package]] -name = "chrono-tz" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" -dependencies = [ - "chrono", - "chrono-tz-build 0.2.1", - "phf", + "windows-targets 0.52.6", ] [[package]] @@ -1473,14 +1662,14 @@ dependencies = [ ] [[package]] -name = "chrono-tz-build" -version = "0.2.1" +name = "chrono-tz" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6" dependencies = [ - "parse-zoneinfo", + "chrono", + "chrono-tz-build 0.4.0", "phf", - "phf_codegen", ] [[package]] @@ -1494,6 +1683,16 @@ dependencies = [ "phf_codegen", ] +[[package]] +name = "chrono-tz-build" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7" +dependencies = [ + "parse-zoneinfo", + "phf_codegen", +] + [[package]] name = "cipher" version = "0.3.0" @@ -1503,21 +1702,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -1526,9 +1715,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -1536,9 +1725,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -1548,36 +1737,36 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "combine" @@ -1599,9 +1788,8 @@ version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "crossterm", - "strum 0.26.2", - "strum_macros 0.26.2", + "strum 0.26.3", + "strum_macros 0.26.4", "unicode-width", ] @@ -1650,10 +1838,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] -name = "const_format" -version = "0.2.32" +name = "const-random" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "const_format" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", "konst", @@ -1661,9 +1869,9 @@ dependencies = [ [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2", "quote", @@ -1672,9 +1880,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1730,15 +1938,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1843,28 +2051,6 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.5.0", - "crossterm_winapi", - "libc", - "parking_lot", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -1894,18 +2080,38 @@ dependencies = [ ] [[package]] -name = "curve25519-dalek" -version = "4.1.2" +name = "csv" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -1918,7 +2124,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -1933,12 +2139,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1957,16 +2163,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -1982,13 +2188,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -2016,6 +2222,309 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +[[package]] +name = "datafusion" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f92d2d7a9cba4580900b32b009848d9eb35f1028ac84cdd6ddcf97612cd0068" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-array", + "arrow-ipc", + "arrow-schema", + "async-compression 0.4.16", + "async-trait", + "bytes", + "bzip2", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-array", + "datafusion-optimizer", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "datafusion-physical-plan", + "datafusion-sql", + "flate2", + "futures", + "glob", + "half", + "hashbrown 0.14.5", + "indexmap 2.6.0", + "itertools 0.12.1", + "log", + "num_cpus", + "object_store", + "parking_lot", + "parquet", + "paste", + "pin-project-lite", + "rand 0.8.5", + "sqlparser", + "tempfile", + "tokio", + "tokio-util", + "url", + "uuid 1.11.0", + "xz2", + "zstd 0.13.2", +] + +[[package]] +name = "datafusion-common" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effed030d2c1667eb1e11df5372d4981eaf5d11a521be32220b3985ae5ba6971" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", + "chrono", + "half", + "hashbrown 0.14.5", + "instant", + "libc", + "num_cpus", + "object_store", + "parquet", + "sqlparser", +] + +[[package]] +name = "datafusion-common-runtime" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0091318129dad1359f08e4c6c71f855163c35bba05d1dbf983196f727857894" +dependencies = [ + "tokio", +] + +[[package]] +name = "datafusion-execution" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8385aba84fc4a06d3ebccfbcbf9b4f985e80c762fac634b49079f7cc14933fb1" +dependencies = [ + "arrow", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-expr", + "futures", + "hashbrown 0.14.5", + "log", + "object_store", + "parking_lot", + "rand 0.8.5", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-expr" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebb192f0055d2ce64e38ac100abc18e4e6ae9734d3c28eee522bbbd6a32108a3" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-array", + "arrow-buffer", + "chrono", + "datafusion-common", + "paste", + "serde_json", + "sqlparser", + "strum 0.26.3", + "strum_macros 0.26.4", +] + +[[package]] +name = "datafusion-functions" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c081ae5b7edd712b92767fb8ed5c0e32755682f8075707666cd70835807c0b" +dependencies = [ + "arrow", + "base64 0.22.1", + "blake2", + "blake3", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", + "hashbrown 0.14.5", + "hex", + "itertools 0.12.1", + "log", + "md-5 0.10.6", + "rand 0.8.5", + "regex", + "sha2 0.10.8", + "unicode-segmentation", + "uuid 1.11.0", +] + +[[package]] +name = "datafusion-functions-aggregate" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb28a4ea52c28a26990646986a27c4052829a2a2572386258679e19263f8b78" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-schema", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "log", + "paste", + "sqlparser", +] + +[[package]] +name = "datafusion-functions-array" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b17c02a74cdc87380a56758ec27e7d417356bf806f33062700908929aedb8a" +dependencies = [ + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "itertools 0.12.1", + "log", + "paste", +] + +[[package]] +name = "datafusion-optimizer" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12172f2a6c9eb4992a51e62d709eeba5dedaa3b5369cce37ff6c2260e100ba76" +dependencies = [ + "arrow", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "hashbrown 0.14.5", + "indexmap 2.6.0", + "itertools 0.12.1", + "log", + "regex-syntax 0.8.5", +] + +[[package]] +name = "datafusion-physical-expr" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3fce531b623e94180f6cd33d620ef01530405751b6ddd2fd96250cdbd78e2e" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "arrow-string", + "base64 0.22.1", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate", + "datafusion-physical-expr-common", + "half", + "hashbrown 0.14.5", + "hex", + "indexmap 2.6.0", + "itertools 0.12.1", + "log", + "paste", + "petgraph", + "regex", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046400b6a2cc3ed57a7c576f5ae6aecc77804ac8e0186926b278b189305b2a77" +dependencies = [ + "arrow", + "datafusion-common", + "datafusion-expr", + "rand 0.8.5", +] + +[[package]] +name = "datafusion-physical-plan" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aed47f5a2ad8766260befb375b201592e86a08b260256e168ae4311426a2bff" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "futures", + "half", + "hashbrown 0.14.5", + "indexmap 2.6.0", + "itertools 0.12.1", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "rand 0.8.5", + "tokio", +] + +[[package]] +name = "datafusion-sql" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa92bb1fd15e46ce5fb6f1c85f3ac054592560f294429a28e392b5f9cd4255e" +dependencies = [ + "arrow", + "arrow-array", + "arrow-schema", + "datafusion-common", + "datafusion-expr", + "log", + "regex", + "sqlparser", + "strum 0.26.3", +] + [[package]] name = "debug-helper" version = "0.3.13" @@ -2029,23 +2538,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] name = "deno_ast" -version = "0.33.3" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f61944e781d268799bf65857e664d3c09a37590043d4b0ed10facefc9bea473" +checksum = "b2b9d03b1bbeeecdac54367f075d572131736d06c5be3bc49037855bc5ab1bbb" dependencies = [ - "anyhow", "base64 0.21.7", "deno_media_type", - "deno_terminal", + "deno_terminal 0.1.1", "dprint-swc-ext", "once_cell", "percent-encoding", "serde", + "sourcemap 9.0.0", "swc_atoms", "swc_common", "swc_config", @@ -2068,26 +2577,28 @@ dependencies = [ "swc_visit", "swc_visit_macros", "text_lines", + "thiserror", "unicode-width", "url", ] [[package]] name = "deno_console" -version = "0.138.0" +version = "0.171.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127f3cd696c88f4304aff28c621403b467e1ea032fef9a68d97224f23f0feca0" +checksum = "144108c8bb93b1df2cda4583d9beb8cd4e18798d3e030af8b07d2c55c1e3259b" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.262.0" +version = "0.311.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0c12fbe4f2c497ff53de92dd698a27d93f8e9c2519ea5684f608cb9f4ef44b" +checksum = "5e09bd55da542fa1fde753aff617c355b5d782e763ab2a19e4371a56d7844cac" dependencies = [ "anyhow", + "bincode", "bit-set", "bit-vec", "bytes", @@ -2097,15 +2608,15 @@ dependencies = [ "deno_unsync", "futures", "libc", - "log", "memoffset", "parking_lot", + "percent-encoding", "pin-project", "serde", "serde_json", "serde_v8", "smallvec", - "sourcemap 7.1.1", + "sourcemap 8.0.1", "static_assertions", "tokio", "url", @@ -2120,22 +2631,35 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_fetch" -version = "0.162.0" +version = "0.195.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda01ee18545896687663c44c74833b51f1a9c2b1afa5dc9b963174a8639c02" +checksum = "8a91340a1d60cebe1392e4b6e1614709ab5fdcfc1f55842561e498d7ef9b2cb9" dependencies = [ + "base64 0.21.7", "bytes", "data-url", "deno_core", + "deno_permissions", "deno_tls", "dyn-clone", - "http 0.2.12", - "pin-project", - "reqwest 0.11.20", + "error_reporter", + "http 1.1.0", + "http-body-util", + "hyper 1.5.0", + "hyper-rustls 0.27.3", + "hyper-util", + "ipnet", + "percent-encoding", + "rustls-webpki 0.102.8", "serde", "serde_json", "tokio", + "tokio-rustls 0.26.0", + "tokio-socks", "tokio-util", + "tower 0.4.13", + "tower-http 0.6.1", + "tower-service", ] [[package]] @@ -2151,32 +2675,80 @@ dependencies = [ [[package]] name = "deno_native_certs" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4785d0bdc13819b665b71e4fb7e119d859568471e4c245ec5610857e70c9345" +checksum = "86bc737e098a45aa5742d51ce694ac7236a1e69fb0d9df8c862e9b4c9583c5f9" dependencies = [ "dlopen2", "dlopen2_derive", "once_cell", - "rustls-native-certs", - "rustls-pemfile 1.0.4", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.2.0", +] + +[[package]] +name = "deno_net" +version = "0.163.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b769fd37232a38bf15a3834c9da8cc99409b52d0cf4a936f3117744369f8063" +dependencies = [ + "deno_core", + "deno_permissions", + "deno_tls", + "pin-project", + "rustls-tokio-stream", + "serde", + "socket2 0.5.7", + "tokio", + "trust-dns-proto", + "trust-dns-resolver", ] [[package]] name = "deno_ops" -version = "0.138.0" +version = "0.187.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04698b09128a026abe3d8a82fdb231baf1a35f07443844728fe1441b2c2340f1" +checksum = "e040fd4def8a67538fe38c9955fd970efc9f44284bd69d44f8992a456afd665d" dependencies = [ "proc-macro-rules", "proc-macro2", "quote", "strum 0.25.0", "strum_macros 0.25.3", - "syn 2.0.65", + "syn 2.0.81", "thiserror", ] +[[package]] +name = "deno_path_util" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4889646c1ce8437a6fde3acb057fd7e2d039e62c61f5063fc125ed1ede114dc6" +dependencies = [ + "percent-encoding", + "thiserror", + "url", +] + +[[package]] +name = "deno_permissions" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1328c2d1d26cd066ba9d7d5fb3451081219e373342423f78d7a1b73bfac9849" +dependencies = [ + "deno_core", + "deno_path_util", + "deno_terminal 0.2.0", + "fqdn", + "libc", + "log", + "once_cell", + "percent-encoding", + "serde", + "which 4.4.2", + "winapi", +] + [[package]] name = "deno_terminal" version = "0.1.1" @@ -2188,66 +2760,76 @@ dependencies = [ ] [[package]] -name = "deno_tls" -version = "0.125.0" +name = "deno_terminal" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60348b1603059601ec4573e2e1f36579039668fa0b1cd47baba39056ce0f5e7a" +checksum = "daef12499e89ee99e51ad6000a91f600d3937fb028ad4918af76810c5bc9e0d5" +dependencies = [ + "once_cell", + "termcolor", +] + +[[package]] +name = "deno_tls" +version = "0.158.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a1abc6bd8af41aa2496ceceef94f4277092c781a9495c437327a17659553a2" dependencies = [ "deno_core", "deno_native_certs", - "once_cell", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls 0.23.15", + "rustls-pemfile 2.2.0", "rustls-tokio-stream", - "rustls-webpki 0.101.7", + "rustls-webpki 0.102.8", "serde", - "webpki-roots 0.25.4", + "tokio", + "webpki-roots 0.26.6", ] [[package]] name = "deno_unsync" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d79c7af81e0a5ac75cff7b2fff4d1896e2bff694c688258edf21ef8a519736" +checksum = "2f36b4ef61a04ce201b925a5dffa90f88437d37fee4836c758470dd15ba7f05e" dependencies = [ + "parking_lot", "tokio", ] [[package]] name = "deno_url" -version = "0.138.0" +version = "0.171.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8297e19f3ac7ef20915a997897ee50727c25c6c27483abcac51c2071e9fc4d" +checksum = "68eb6834d66ff13c19633b0e1b621292461b744858130b0a1c51f34a57ba1a03" dependencies = [ "deno_core", - "serde", "urlpattern", ] [[package]] name = "deno_web" -version = "0.169.0" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4020ea0467666c8e3cb751be833c12b7bc9df203f8e36c0fa23225f6547f2cc7" +checksum = "e0862246372f5b559b788aa07ca1b9385909d59630251156a54c4d2c5342d1eb" dependencies = [ "async-trait", "base64-simd 0.8.0", "bytes", "deno_core", + "deno_permissions", "encoding_rs", "flate2", "futures", "serde", "tokio", - "uuid 1.8.0", - "windows-sys 0.48.0", + "uuid 1.11.0", ] [[package]] name = "deno_webidl" -version = "0.138.0" +version = "0.171.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344a5a4dd5628298e533e7e192bee6d2cf141b14e22fc998b8dbaf64d8153758" +checksum = "5e969b61b740479379eaf303a6900d11f162f9de610640398f89f0aa58abb7c4" dependencies = [ "deno_core", ] @@ -2317,15 +2899,15 @@ dependencies = [ [[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 0.4.0", "proc-macro2", "quote", - "rustc_version 0.4.0", - "syn 1.0.109", + "rustc_version 0.4.1", + "syn 2.0.81", ] [[package]] @@ -2335,7 +2917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" dependencies = [ "byteorder", - "cipher 0.3.0", + "cipher", "opaque-debug", ] @@ -2404,9 +2986,9 @@ dependencies = [ [[package]] name = "dlopen2" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" dependencies = [ "dlopen2_derive", "libc", @@ -2422,7 +3004,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -2444,14 +3026,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] -name = "dprint-swc-ext" -version = "0.14.1" +name = "downcast-rs" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebaedd46a16dd179b260a9fcb56be5780814afcb20f615eedde6acf971c9628e" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dprint-swc-ext" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba28c12892aadb751c2ba7001d8460faee4748a04b4edc51c7121cc67ee03db" dependencies = [ - "bumpalo", "num-bigint", - "rustc-hash", + "rustc-hash 1.1.0", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -2521,9 +3108,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -2566,46 +3153,34 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.65", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -2624,6 +3199,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "error_reporter" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ae425815400e5ed474178a7a22e275a9687086a12ca63ec793ff292d8fdae8" + [[package]] name = "esaxx-rs" version = "0.1.10" @@ -2644,12 +3225,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "ethnum" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" - [[package]] name = "event-listener" version = "2.5.3" @@ -2658,43 +3233,22 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -2705,16 +3259,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" +name = "fastdivide" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fast-float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" [[package]] name = "fastrand" @@ -2727,9 +3275,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -2749,38 +3297,48 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] -name = "finl_unicode" -version = "1.2.0" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flatbuffers" +version = "24.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f" +dependencies = [ + "bitflags 1.3.2", + "rustc_version 0.4.1", +] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", @@ -2793,6 +3351,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2808,12 +3372,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2824,66 +3382,86 @@ dependencies = [ ] [[package]] -name = "from_variant" -version = "0.1.7" +name = "fqdn" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" +checksum = "eb540cf7bc4fe6df9d8f7f0c974cfd0dce8ed4e9e8884e73433b503ee78b4e7d" + +[[package]] +name = "from_variant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "frunk" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" +checksum = "874b6a17738fc273ec753618bac60ddaeac48cb1d7684c3e7bd472e57a28b817" dependencies = [ "frunk_core", "frunk_derives", "frunk_proc_macros", + "serde", ] [[package]] name = "frunk_core" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" +checksum = "3529a07095650187788833d585c219761114005d5976185760cf794d265b6a5c" +dependencies = [ + "serde", +] [[package]] name = "frunk_derives" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" +checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "frunk_proc_macro_helpers" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" +checksum = "05a956ef36c377977e512e227dcad20f68c2786ac7a54dacece3746046fea5ce" dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "frunk_proc_macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" +checksum = "67e86c2c9183662713fea27ea527aad20fb15fee635a71081ff91bf93df4dc51" dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.65", + "syn 2.0.81", +] + +[[package]] +name = "fs4" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +dependencies = [ + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -2904,9 +3482,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2919,9 +3497,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2929,15 +3507,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2957,9 +3535,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2982,7 +3560,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2991,32 +3569,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -3039,8 +3617,8 @@ dependencies = [ "async-trait", "base64 0.21.7", "dirs-next", - "hyper 0.14.28", - "hyper-rustls", + "hyper 0.14.31", + "hyper-rustls 0.24.2", "ring 0.16.20", "rustls 0.21.12", "rustls-pemfile 1.0.4", @@ -3071,7 +3649,7 @@ dependencies = [ "num-complex", "num-traits", "paste", - "raw-cpuid 10.7.0", + "raw-cpuid", "seq-macro", ] @@ -3086,7 +3664,7 @@ dependencies = [ "num-complex", "num-traits", "paste", - "raw-cpuid 10.7.0", + "raw-cpuid", "seq-macro", ] @@ -3101,7 +3679,7 @@ dependencies = [ "num-complex", "num-traits", "paste", - "raw-cpuid 10.7.0", + "raw-cpuid", "seq-macro", ] @@ -3119,7 +3697,7 @@ dependencies = [ "once_cell", "paste", "pulp", - "raw-cpuid 10.7.0", + "raw-cpuid", "rayon", "seq-macro", "sysctl", @@ -3138,7 +3716,7 @@ dependencies = [ "num-complex", "num-traits", "paste", - "raw-cpuid 10.7.0", + "raw-cpuid", "rayon", "seq-macro", ] @@ -3154,7 +3732,7 @@ dependencies = [ "num-complex", "num-traits", "paste", - "raw-cpuid 10.7.0", + "raw-cpuid", "seq-macro", ] @@ -3169,7 +3747,7 @@ dependencies = [ "num-complex", "num-traits", "paste", - "raw-cpuid 10.7.0", + "raw-cpuid", "seq-macro", ] @@ -3229,9 +3807,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git-version" @@ -3250,7 +3828,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -3274,9 +3852,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-timers" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ "futures-channel", "futures-core", @@ -3286,9 +3864,9 @@ dependencies = [ [[package]] name = "gosyn" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14163cf566b1496f50447a61981892272a61ef220d37e69508e19075bc66e3f1" +checksum = "5eb37859fda6792e95231aef1c5838f4043ec0ee352d8313421e311c606df612" dependencies = [ "anyhow", "strum 0.25.0", @@ -3307,6 +3885,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "gzip-header" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" +dependencies = [ + "crc32fast", +] + [[package]] name = "h2" version = "0.3.26" @@ -3319,7 +3906,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3328,9 +3915,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -3338,7 +3925,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3385,14 +3972,24 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", - "rayon", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", ] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -3402,9 +3999,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -3418,6 +4012,12 @@ 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" version = "0.4.3" @@ -3469,19 +4069,36 @@ dependencies = [ ] [[package]] -name = "hstr" -version = "0.2.10" +name = "hostname" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96274be293b8877e61974a607105d09c84caebe9620b47774aa8a6b942042dd4" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "hstr" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dae404c0c5d4e95d4858876ab02eecd6a196bb8caa42050dfa809938833fc412" dependencies = [ "hashbrown 0.14.5", "new_debug_unreachable", "once_cell", "phf", - "rustc-hash", + "rustc-hash 1.1.0", "triomphe", ] +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + [[package]] name = "http" version = "0.2.12" @@ -3517,9 +4134,9 @@ dependencies = [ [[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.1.0", @@ -3527,14 +4144,14 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -3561,9 +4178,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -3579,9 +4196,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -3603,16 +4220,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -3630,14 +4247,32 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.31", "log", "rustls 0.21.12", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.5.0", + "hyper-util", + "rustls 0.23.15", + "rustls-native-certs 0.8.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -3645,7 +4280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -3659,7 +4294,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.3.1", + "hyper 1.5.0", "hyper-util", "native-tls", "tokio", @@ -3669,29 +4304,29 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.5.0", "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3716,6 +4351,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.5.0" @@ -3745,12 +4390,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -3773,15 +4418,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.13" @@ -3789,42 +4425,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "integer-encoding" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "hermit-abi", - "libc", + "socket2 0.5.7", + "widestring", "windows-sys 0.48.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -3868,26 +4514,20 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "itoap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" - [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3912,7 +4552,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", ] [[package]] @@ -3947,11 +4587,11 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[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" dependencies = [ - "spin 0.5.2", + "spin 0.9.8", ] [[package]] @@ -3961,10 +4601,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libc" -version = "0.2.155" +name = "levenshtein_automata" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" + +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libgit2-sys" @@ -3980,12 +4690,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4000,15 +4710,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -4028,9 +4739,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -4039,10 +4750,10 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" @@ -4062,18 +4773,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "loki-api" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56d36f573486ba7f462b62cbae597fef7d5d93665e7047956b457531b8a1ced" +checksum = "674883a98273598ac3aad4301724c56734bea90574c5033af067e8f9fb5eb399" dependencies = [ "prost", "prost-types", @@ -4081,31 +4792,29 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] -name = "lz4" -version = "1.24.0" +name = "lru-cache" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" dependencies = [ - "libc", - "lz4-sys", + "linked-hash-map", ] [[package]] -name = "lz4-sys" -version = "1.9.4" +name = "lz4_flex" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" dependencies = [ - "cc", - "libc", + "twox-hash", ] [[package]] @@ -4141,7 +4850,7 @@ version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c42f95f9d296f2dcb50665f507ed5a68a171453142663ce44d77a4eb217b053" dependencies = [ - "aes 0.7.5", + "aes", "base64 0.21.7", "block-modes", "crc-any", @@ -4154,35 +4863,45 @@ dependencies = [ [[package]] name = "mail-builder" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef70f53409852d2612f2249810cbbe0c9931ca25b739b734bafc7f61d88051d4" +checksum = "25f5871d5270ed80f2ee750b95600c8d69b05f8653ad3be913b2ad2e924fefcb" dependencies = [ "gethostname", ] +[[package]] +name = "mail-parser" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93c3b9e5d8b17faf573330bbc43b37d6e918c0a3bf8a88e7d0a220ebc84af9fc" +dependencies = [ + "encoding_rs", + "serde", +] + [[package]] name = "mail-send" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735ca5a9c5b6acb5f9e7089ee7b96d10c54d4df91e9b47321ef6bb468f90483d" +checksum = "7a575d25cf00ed68e5790b473b29242a47e991c6187785d47b45e31fc5816554" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "gethostname", "mail-builder", - "rustls 0.22.4", + "rustls 0.23.15", "rustls-pki-types", "smtp-proto", "tokio", - "tokio-rustls 0.25.0", - "webpki-roots 0.26.1", + "tokio-rustls 0.26.0", + "webpki-roots 0.26.6", ] [[package]] name = "malachite" -version = "0.4.7" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ad951c9d45bd4c77f4c843844870dddeb2e332864226f5a62277498e1627b8" +checksum = "5616515d632967cd329b6f6db96be9a03ea0b3a49cdbc45b0016803dad8a77b7" dependencies = [ "malachite-base", "malachite-nz", @@ -4191,9 +4910,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.4.7" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d073a3d1e4e037975af5ef176a2632672e25e8ddbe8e1811745c2e0726b6ad94" +checksum = "46059721011b0458b7bd6d9179be5d0b60294281c23320c207adceaecc54d13b" dependencies = [ "hashbrown 0.14.5", "itertools 0.11.0", @@ -4216,9 +4935,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.4.7" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2546fc6ae29728079e87a2a0f011509e6060713b65e62ee46ba5d413b495ebc7" +checksum = "1503b27e825cabd1c3d0ff1e95a39fb2ec9eab6fd3da6cfa41aec7091d273e78" dependencies = [ "itertools 0.11.0", "libm", @@ -4227,15 +4946,27 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.4.7" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad0ac879ecbb7e1cc8060b48696eebed0b0de8d922db4f8b378dfbc1bad806a" +checksum = "a475503a70a3679dbe3b9b230a23622516742528ba614a7b2490f180ea9cb514" dependencies = [ "itertools 0.11.0", "malachite-base", "malachite-nz", ] +[[package]] +name = "mappable-rc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "204651f31b0a6a7b2128d2b92c372cd94607b210c3a6b6e542c57a8cfd4db996" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + [[package]] name = "matchers" version = "0.1.0" @@ -4279,25 +5010,26 @@ dependencies = [ ] [[package]] -name = "memchr" -version = "2.7.2" +name = "measure_time" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" dependencies = [ - "libc", + "instant", + "log", ] [[package]] -name = "memmap2" -version = "0.9.4" +name = "memchr" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", "stable_deref_trait", @@ -4320,9 +5052,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -4336,13 +5068,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -4350,7 +5091,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -4373,7 +5113,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -4394,26 +5134,10 @@ dependencies = [ ] [[package]] -name = "multiversion" -version = "0.7.4" +name = "murmurhash32" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" -dependencies = [ - "multiversion-macros", - "target-features", -] - -[[package]] -name = "multiversion-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "target-features", -] +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "mysql-common-derive" @@ -4421,23 +5145,23 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afe0450cc9344afff34915f8328600ab5ae19260802a334d0f72d2d5bdda3bfe" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "heck 0.4.1", "num-bigint", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", "termcolor", "thiserror", ] [[package]] name = "mysql_async" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbfe87d7e35cb72363326216cc1712b865d8d4f70abf3b2d2e6b251fb6b2f427" +checksum = "a0b66e411c31265e879d9814d03721f2daa7ad07337b6308cb4bb0cde7e6fd47" dependencies = [ "bytes", "crossbeam", @@ -4446,12 +5170,9 @@ dependencies = [ "futures-sink", "futures-util", "keyed_priority_queue", - "lazy_static", "lru", - "mio", "mysql_common", "native-tls", - "once_cell", "pem 3.0.4", "percent-encoding", "pin-project", @@ -4469,14 +5190,14 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e52cf194ab414202ead9dfda216d2a9ec59cc97ac024ba499ca686d82f040d" +checksum = "478b0ff3f7d67b79da2b96f56f334431aef65e15ba4b29dd74a4236e29582bdc" dependencies = [ "base64 0.21.7", - "bigdecimal 0.4.3", - "bindgen", - "bitflags 2.5.0", + "bigdecimal", + "bindgen 0.70.1", + "bitflags 2.6.0", "bitvec", "btoi", "byteorder", @@ -4502,17 +5223,16 @@ dependencies = [ "subprocess", "thiserror", "time", - "uuid 1.8.0", - "zstd 0.13.1", + "uuid 1.11.0", + "zstd 0.13.2", ] [[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", @@ -4536,7 +5256,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] @@ -4551,24 +5271,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "now" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0" -dependencies = [ - "chrono", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -4580,10 +5282,24 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.5" +name = "num" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -4644,6 +5360,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -4660,7 +5387,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", ] @@ -4681,7 +5408,7 @@ dependencies = [ "getrandom 0.2.15", "http 0.2.12", "rand 0.8.5", - "reqwest 0.11.20", + "reqwest 0.11.27", "serde", "serde_json", "serde_path_to_error", @@ -4692,33 +5419,33 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper 0.14.28", - "itertools 0.12.1", + "hyper 1.5.0", + "itertools 0.13.0", "md-5 0.10.6", "parking_lot", "percent-encoding", - "quick-xml 0.31.0", + "quick-xml 0.36.2", "rand 0.8.5", - "reqwest 0.11.20", + "reqwest 0.12.8", "ring 0.17.8", "serde", "serde_json", @@ -4731,9 +5458,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oneshot" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" [[package]] name = "onig" @@ -4808,11 +5541,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -4829,7 +5562,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -4840,9 +5573,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -4883,6 +5616,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "ownedbytes" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" +dependencies = [ + "stable_deref_trait", +] + [[package]] name = "p256" version = "0.13.2" @@ -4909,15 +5651,15 @@ dependencies = [ [[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" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4931,19 +5673,45 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.7", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] -name = "parquet-format-safe" -version = "0.2.4" +name = "parquet" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" +checksum = "e977b9066b4d3b03555c22bdc442f3fadebd96a39111249113087d0edb2691cd" dependencies = [ - "async-trait", + "ahash 0.8.11", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", + "base64 0.22.1", + "brotli 6.0.0", + "bytes", + "chrono", + "flate2", "futures", + "half", + "hashbrown 0.14.5", + "lz4_flex", + "num", + "num-bigint", + "object_store", + "paste", + "seq-macro", + "snap", + "thrift", + "tokio", + "twox-hash", + "zstd 0.13.2", + "zstd-sys", ] [[package]] @@ -4955,17 +5723,6 @@ dependencies = [ "regex", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "password-hash" version = "0.5.0" @@ -4985,21 +5742,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac", - "password-hash 0.4.2", - "sha2 0.10.8", -] +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pem" @@ -5045,21 +5790,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "pg-embed" -version = "0.7.2" -source = "git+https://github.com/faokunega/pg-embed#72db5e053f0afac6eee51d3baa2fd5c90803e02d" +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ - "archiver-rs", - "async-trait", - "bytes", - "dirs", - "futures", - "lazy_static", - "log", - "reqwest 0.11.20", - "thiserror", - "tokio", - "zip", + "fixedbitset", + "indexmap 2.6.0", ] [[package]] @@ -5102,7 +5839,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -5128,22 +5865,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -5160,12 +5897,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -5214,444 +5951,30 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "planus" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" -dependencies = [ - "array-init-cursor", -] - -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.65", -] - -[[package]] -name = "polars" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f01006048a264047d6cba081fed8e11adbd69c15956f9e53185a9ac4a541853c" -dependencies = [ - "getrandom 0.2.15", - "polars-arrow", - "polars-core", - "polars-error", - "polars-io", - "polars-lazy", - "polars-ops", - "polars-parquet", - "polars-sql", - "polars-time", - "polars-utils", - "version_check", -] - -[[package]] -name = "polars-arrow" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25197f40d71f82b2f79bb394f03e555d3cc1ce4db1dd052c28318721c71e96ad" -dependencies = [ - "ahash 0.8.11", - "atoi", - "atoi_simd", - "bytemuck", - "chrono", - "chrono-tz 0.8.6", - "dyn-clone", - "either", - "ethnum", - "fast-float", - "foreign_vec", - "futures", - "getrandom 0.2.15", - "hashbrown 0.14.5", - "itoa", - "itoap", - "lz4", - "multiversion", - "num-traits", - "polars-arrow-format", - "polars-error", - "polars-utils", - "ryu", - "simdutf8", - "streaming-iterator", - "strength_reduce", - "version_check", - "zstd 0.13.1", -] - -[[package]] -name = "polars-arrow-format" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b0ef2474af9396b19025b189d96e992311e6a47f90c53cd998b36c4c64b84c" -dependencies = [ - "planus", - "serde", -] - -[[package]] -name = "polars-compute" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c354515f73cdbbad03c2bf723fcd68e6825943b3ec503055abc8a8cb08ce46bb" -dependencies = [ - "bytemuck", - "either", - "num-traits", - "polars-arrow", - "polars-error", - "polars-utils", - "strength_reduce", - "version_check", -] - -[[package]] -name = "polars-core" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f20d3c227186f74aa3c228c64ef72f5a15617322fed30b4323eaf53b25f8e7b" -dependencies = [ - "ahash 0.8.11", - "bitflags 2.5.0", - "bytemuck", - "chrono", - "chrono-tz 0.8.6", - "comfy-table", - "either", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "num-traits", - "once_cell", - "polars-arrow", - "polars-compute", - "polars-error", - "polars-row", - "polars-utils", - "rand 0.8.5", - "rand_distr", - "rayon", - "regex", - "serde", - "smartstring", - "thiserror", - "version_check", - "xxhash-rust", -] - -[[package]] -name = "polars-error" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dd0ce51f8bd620eb8bd376502fe68a2b1a446d5433ecd2e75270b0755ce76" -dependencies = [ - "object_store", - "polars-arrow-format", - "regex", - "simdutf8", - "thiserror", -] - -[[package]] -name = "polars-io" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40bef2edcdc58394792c4d779465144283a09ff1836324e7b72df7978a6e992" -dependencies = [ - "ahash 0.8.11", - "async-trait", - "atoi_simd", - "bytes", - "chrono", - "fast-float", - "flate2", - "futures", - "home", - "itoa", - "memchr", - "memmap2 0.7.1", - "num-traits", - "object_store", - "once_cell", - "percent-encoding", - "polars-arrow", - "polars-core", - "polars-error", - "polars-parquet", - "polars-time", - "polars-utils", - "rayon", - "regex", - "reqwest 0.11.20", - "ryu", - "simdutf8", - "smartstring", - "tokio", - "tokio-util", - "url", - "zstd 0.13.1", -] - -[[package]] -name = "polars-lazy" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27df26a19d3092298d31d47614ad84dc330c106e38aa8cd53727cd91c07cf56" -dependencies = [ - "ahash 0.8.11", - "bitflags 2.5.0", - "futures", - "glob", - "once_cell", - "polars-arrow", - "polars-core", - "polars-io", - "polars-ops", - "polars-pipe", - "polars-plan", - "polars-time", - "polars-utils", - "rayon", - "smartstring", - "tokio", - "version_check", -] - -[[package]] -name = "polars-ops" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a51c3bdc9e7c34196ff6f5c3cb17da134e5aafb1756aaf24b76c7118e63dc" -dependencies = [ - "ahash 0.8.11", - "argminmax", - "base64 0.21.7", - "bytemuck", - "chrono", - "chrono-tz 0.8.6", - "either", - "hashbrown 0.14.5", - "hex", - "indexmap 2.2.6", - "memchr", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-error", - "polars-utils", - "rayon", - "regex", - "smartstring", - "unicode-reverse", - "version_check", -] - -[[package]] -name = "polars-parquet" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8824ee00fbbe83d69553f2711014c50361238d210ed81a7a297695b7db97d42" -dependencies = [ - "ahash 0.8.11", - "async-stream", - "base64 0.21.7", - "brotli 3.5.0", - "ethnum", - "flate2", - "futures", - "lz4", - "num-traits", - "parquet-format-safe", - "polars-arrow", - "polars-error", - "polars-utils", - "seq-macro", - "simdutf8", - "snap", - "streaming-decompression", - "zstd 0.13.1", -] - -[[package]] -name = "polars-pipe" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5e2c1f14e81d60cfa9afe4e611a9bad9631a2cb7cd19b7c0094d0dc32f0231" -dependencies = [ - "crossbeam-channel", - "crossbeam-queue", - "enum_dispatch", - "futures", - "hashbrown 0.14.5", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-io", - "polars-ops", - "polars-plan", - "polars-row", - "polars-utils", - "rayon", - "smartstring", - "tokio", - "uuid 1.8.0", - "version_check", -] - -[[package]] -name = "polars-plan" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff48362bd1b078bbbec7e7ba9ec01fea58fee2887db22a8e3deaf78f322fa3c4" -dependencies = [ - "ahash 0.8.11", - "bytemuck", - "chrono-tz 0.8.6", - "futures", - "once_cell", - "percent-encoding", - "polars-arrow", - "polars-core", - "polars-io", - "polars-ops", - "polars-parquet", - "polars-time", - "polars-utils", - "rayon", - "regex", - "smartstring", - "strum_macros 0.25.3", - "version_check", -] - -[[package]] -name = "polars-row" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63029da56ff6a720b190490bbc7b6263f9b72d1134311b1f381fc8d306d37770" -dependencies = [ - "bytemuck", - "polars-arrow", - "polars-error", - "polars-utils", -] - -[[package]] -name = "polars-sql" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3652c362959f608d1297196b973d1e3acb508a9562b886ac39bf7606b841052b" -dependencies = [ - "hex", - "polars-arrow", - "polars-core", - "polars-error", - "polars-lazy", - "polars-plan", - "rand 0.8.5", - "serde", - "serde_json", - "sqlparser", -] - -[[package]] -name = "polars-time" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86eb74ea6ddfe675aa5c3f33c00dadbe2b85f0e8e3887b85db1fd5a3397267fd" -dependencies = [ - "atoi", - "chrono", - "chrono-tz 0.8.6", - "now", - "once_cell", - "polars-arrow", - "polars-core", - "polars-error", - "polars-ops", - "polars-utils", - "regex", - "smartstring", -] - -[[package]] -name = "polars-utils" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694656a7d2b0cd8f07660dbc8d0fb7a81066ff57a452264907531d805c1e58c4" -dependencies = [ - "ahash 0.8.11", - "bytemuck", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "num-traits", - "once_cell", - "polars-error", - "raw-cpuid 11.0.2", - "rayon", - "smartstring", - "sysinfo", - "version_check", -] +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" 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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "postgres-native-tls" @@ -5668,11 +5991,11 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "byteorder", "bytes", "fallible-iterator", @@ -5686,9 +6009,9 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" +checksum = "f66ea23a2d0e5734297357705193335e0a957696f34bed2f2faefacb2fec336f" dependencies = [ "array-init", "bit-vec", @@ -5698,7 +6021,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] @@ -5709,9 +6032,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pretty-hex" @@ -5731,12 +6057,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "910d41a655dac3b764f1ade94821093d3610248694320cd072303a8eedcf221d" dependencies = [ "proc-macro2", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -5750,11 +6076,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -5789,7 +6115,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" dependencies = [ "proc-macro-rules-macros", "proc-macro2", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -5801,14 +6127,14 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -5840,7 +6166,7 @@ dependencies = [ "bytes", "futures-core", "percent-encoding", - "reqwest 0.11.20", + "reqwest 0.11.27", "serde", "serde_json", "serde_urlencoded", @@ -5862,7 +6188,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.65", + "syn 2.0.81", "thiserror", "typify", "unicode-ident", @@ -5882,7 +6208,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -5907,9 +6233,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -5917,31 +6243,31 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.81", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -5967,10 +6293,22 @@ dependencies = [ ] [[package]] -name = "pulp" -version = "0.18.12" +name = "pulldown-cmark" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140dfe6dada20716bd5f7284406747c73061a56a0a5d4ad5aee7957c5f71606c" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.6.0", + "getopts", + "memchr", + "unicase", +] + +[[package]] +name = "pulp" +version = "0.18.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" dependencies = [ "bytemuck", "libm", @@ -5978,6 +6316,12 @@ dependencies = [ "reborrow", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quick-xml" version = "0.30.0" @@ -5990,9 +6334,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -6000,9 +6344,9 @@ dependencies = [ [[package]] name = "quick_cache" -version = "0.5.1" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347e1a588d1de074eeb3c00eadff93db4db65aeb62aee852b1efd0949fe65b6c" +checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4" dependencies = [ "ahash 0.8.11", "equivalent", @@ -6011,10 +6355,58 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.36" +name = "quinn" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.15", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring 0.17.8", + "rustc-hash 2.0.0", + "rustls 0.23.15", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -6121,15 +6513,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "raw-cpuid" -version = "11.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" -dependencies = [ - "bitflags 2.5.0", -] - [[package]] name = "rayon" version = "1.10.0" @@ -6200,27 +6583,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", @@ -6229,14 +6603,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -6250,20 +6624,20 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" @@ -6279,9 +6653,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" @@ -6304,11 +6678,10 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "async-compression 0.4.10", "base64 0.21.7", "bytes", "encoding_rs", @@ -6317,8 +6690,8 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls", + "hyper 0.14.31", + "hyper-rustls 0.24.2", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -6329,42 +6702,44 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-native-certs", "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-socks", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams 0.3.0", + "wasm-streams", "web-sys", "webpki-roots 0.25.4", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ + "async-compression 0.4.16", "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.5.0", + "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -6375,22 +6750,37 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.1.2", + "quinn", + "rustls 0.23.15", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", + "sync_wrapper 1.0.1", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams 0.4.0", + "wasm-streams", "web-sys", - "winreg 0.52.0", + "windows-registry", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", ] [[package]] @@ -6441,9 +6831,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -6454,14 +6844,14 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -6544,7 +6934,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.65", + "syn 2.0.81", "walkdir", ] @@ -6559,10 +6949,20 @@ dependencies = [ ] [[package]] -name = "rust_decimal" -version = "1.35.0" +name = "rust-stemmers" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rust_decimal" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", @@ -6587,6 +6987,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.2.3" @@ -6598,9 +7004,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -6614,34 +7020,20 @@ dependencies = [ "serde", "tempfile", "thiserror", - "toml 0.8.13", + "toml 0.8.19", "toolchain_find", ] [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" 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.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -6659,14 +7051,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "log", + "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.4", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -6683,6 +7076,32 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "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 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -6694,28 +7113,27 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-tokio-stream" -version = "0.2.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded7a36e8ac05b8ada77a84c5ceec95361942ee9dedb60a82f93f788a791aae8" +checksum = "22557157d7395bc30727745b365d923f1ecc230c4c80b176545f3f4f08c46e33" dependencies = [ "futures", - "rustls 0.21.12", + "rustls 0.23.15", "socket2 0.5.7", "tokio", ] @@ -6732,9 +7150,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -6766,7 +7184,7 @@ dependencies = [ "num-traits", "phf", "phf_codegen", - "rustc-hash", + "rustc-hash 1.1.0", "rustpython-ast", "rustpython-parser-core", "tiny-keccak", @@ -6796,9 +7214,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -6814,9 +7232,9 @@ checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" [[package]] name = "safetensors" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6" dependencies = [ "serde", "serde_json", @@ -6829,7 +7247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b75583aad4a51c50fc0af69c230d18078c9d5a69a98d0f6013d01053acf744f4" dependencies = [ "base64 0.21.7", - "bindgen", + "bindgen 0.69.5", "chrono", "data-encoding", "derive_builder", @@ -6846,7 +7264,7 @@ dependencies = [ "serde", "thiserror", "url", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] @@ -6866,37 +7284,37 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "schemars" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0218ceea14babe24a4a5836f86ade86c1effbc198164e619194cb5069187e29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "chrono", "dyn-clone", "schemars_derive", "serde", "serde_json", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] name = "schemars_derive" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed5a1ccce8ff962e31a165d41f6e2a2dd1245099dc4d594f5574a86cd90f4d3" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -6943,11 +7361,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6956,9 +7374,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -6996,9 +7414,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -7026,9 +7444,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.4.5" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" dependencies = [ "js-sys", "serde", @@ -7037,13 +7455,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -7054,17 +7472,18 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "itoa", + "memchr", "ryu", "serde", ] @@ -7112,23 +7531,23 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] [[package]] name = "serde_tokenstream" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a00ffd23fd882d096f09fcaae2a9de8329a328628e86027e049ee051dc1621f" +checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -7145,12 +7564,10 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.171.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a2746b1f9e4015ee5f325bb87ab0f1891b76c38dfb1675bc83857eaf6451d0" +checksum = "6e7a65d91d79acc82aa229aeb084f4a39bda269069bc1520df40f679495388e4" dependencies = [ - "bytes", - "derive_more", "num-bigint", "serde", "smallvec", @@ -7160,15 +7577,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -7178,14 +7595,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -7194,24 +7611,13 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "itoa", "ryu", "serde", "unsafe-libyaml", ] -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.10.6" @@ -7225,9 +7631,9 @@ dependencies = [ [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -7308,9 +7714,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple_asn1" @@ -7330,6 +7736,15 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "sketches-ddsketch" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" +dependencies = [ + "serde", +] + [[package]] name = "slab" version = "0.4.9" @@ -7344,6 +7759,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smart-default" @@ -7363,7 +7781,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ "autocfg", - "serde", "static_assertions", "version_check", ] @@ -7379,9 +7796,9 @@ dependencies = [ [[package]] name = "smtp-proto" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34344dcc7dd10b3de9224fd68e5f019fff2246d9cdf8e4322f770f48030e0c83" +checksum = "51b8ad3dd187f0d4debab02ad65405a9919d6a4f7bce25bd64a258781063a53a" [[package]] name = "snafu" @@ -7433,30 +7850,35 @@ dependencies = [ [[package]] name = "sourcemap" -version = "6.4.1" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" +checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" dependencies = [ + "base64-simd 0.7.0", + "bitvec", "data-encoding", "debugid", "if_chain", + "rustc-hash 1.1.0", "rustc_version 0.2.3", "serde", "serde_json", - "unicode-id", + "unicode-id-start", "url", ] [[package]] name = "sourcemap" -version = "7.1.1" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7768edd06c02535e0d50653968f46e1e0d3aa54742190d35dd9466f59de9c71" +checksum = "dab08a862c70980b8e23698b507e272317ae52a608a164a844111f5372374f1f" dependencies = [ "base64-simd 0.7.0", + "bitvec", "data-encoding", "debugid", "if_chain", + "rustc-hash 1.1.0", "rustc_version 0.2.3", "serde", "serde_json", @@ -7523,29 +7945,40 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ - "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlparser" -version = "0.39.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" dependencies = [ "log", + "sqlparser_derive", +] + +[[package]] +name = "sqlparser_derive" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.81", ] [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -7556,35 +7989,35 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ - "ahash 0.8.11", "atoi", - "bigdecimal 0.3.1", + "bigdecimal", "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", "either", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls 0.23.15", + "rustls-pemfile 2.2.0", "serde", "serde_json", "sha2 0.10.8", @@ -7595,32 +8028,32 @@ dependencies = [ "tokio-stream", "tracing", "url", - "uuid 1.8.0", - "webpki-roots 0.25.4", + "uuid 1.11.0", + "webpki-roots 0.26.6", ] [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.81", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -7632,7 +8065,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.81", "tempfile", "tokio", "url", @@ -7640,14 +8073,14 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", - "base64 0.21.7", - "bigdecimal 0.3.1", - "bitflags 2.5.0", + "base64 0.22.1", + "bigdecimal", + "bitflags 2.6.0", "byteorder", "bytes", "chrono", @@ -7679,20 +8112,20 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.8.0", + "uuid 1.11.0", "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", - "base64 0.21.7", - "bigdecimal 0.3.1", - "bitflags 2.5.0", + "base64 0.22.1", + "bigdecimal", + "bitflags 2.6.0", "byteorder", "chrono", "crc", @@ -7721,15 +8154,15 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.8.0", + "uuid 1.11.0", "whoami", ] [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "chrono", @@ -7743,11 +8176,11 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "tracing", "url", - "urlencoding", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] @@ -7758,15 +8191,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -7775,48 +8208,27 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "streaming-decompression" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3" -dependencies = [ - "fallible-streaming-iterator", -] - -[[package]] -name = "streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" - -[[package]] -name = "strength_reduce" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" - [[package]] name = "string_enum" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6960defec35d15d58331ffb8a315d551634f757fe139c7b3d6063cae88ec90f6" +checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] @@ -7842,9 +8254,12 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] [[package]] name = "strum_macros" @@ -7856,20 +8271,20 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -7884,19 +8299,32 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "swc_allocator" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76aa0eb65c0f39f9b6d82a7e5192c30f7ac9a78f084a21f270de1d8c600ca388" +dependencies = [ + "bumpalo", + "hashbrown 0.14.5", + "ptr_meta", + "rustc-hash 1.1.0", + "triomphe", +] [[package]] name = "swc_atoms" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" +checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" dependencies = [ "hstr", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "serde", ] @@ -7916,9 +8344,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.17" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095c158fe55b36faeebb4274692643a6d7cdc5b7902e1d5968ddbe52b7de1d1c" +checksum = "12d0a8eaaf1606c9207077d75828008cb2dfb51b095a766bd2b72ef893576e31" dependencies = [ "ast_node", "better_scoped_tls", @@ -7928,10 +8356,11 @@ dependencies = [ "new_debug_unreachable", "num-bigint", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "siphasher", - "sourcemap 6.4.1", + "sourcemap 9.0.0", + "swc_allocator", "swc_atoms", "swc_eq_ignore_macros", "swc_visit", @@ -7942,12 +8371,12 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.11" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" +checksum = "4740e53eaf68b101203c1df0937d5161a29f3c13bceed0836ddfe245b72dd000" dependencies = [ "anyhow", - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_json", "swc_cached", @@ -7956,23 +8385,23 @@ dependencies = [ [[package]] name = "swc_config_macro" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" +checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "swc_ecma_ast" -version = "0.112.2" +version = "0.118.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852a48a24a2533de88298c6b25355bc68fdee31ac21cb4fb8939b7001715353c" +checksum = "a6f866d12e4d519052b92a0a86d1ac7ff17570da1272ca0c89b3d6f802cd79df" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "is-macro", "num-bigint", "phf", @@ -7981,21 +8410,21 @@ dependencies = [ "string_enum", "swc_atoms", "swc_common", - "unicode-id", + "unicode-id-start", ] [[package]] name = "swc_ecma_codegen" -version = "0.148.3" +version = "0.155.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79df3f8c5ed028fce5dc24acb83002c0854f8b9d7e893292aeee394a6b9eaf4" +checksum = "cc7641608ef117cfbef9581a99d02059b522fcca75e5244fa0cbbd8606689c6f" dependencies = [ "memchr", "num-bigint", "once_cell", - "rustc-hash", "serde", - "sourcemap 6.4.1", + "sourcemap 9.0.0", + "swc_allocator", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -8005,21 +8434,21 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" +checksum = "859fabde36db38634f3fad548dd5e3410c1aebba1b67a3c63e67018fa57a0bca" dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "swc_ecma_loader" -version = "0.45.19" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c16051bce5421992a1b49350735bf4d110f761fd68ae7098af17a64ad639b8d" +checksum = "55fa3d55045b97894bfb04d38aff6d6302ac8a6a38e3bb3dfb0d20475c4974a9" dependencies = [ "anyhow", "pathdiff", @@ -8031,9 +8460,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.143.3" +version = "0.149.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ff55811ed5de14b05e9a2979bae2bce3c807582f559b4325948463265307d9" +checksum = "683dada14722714588b56481399c699378b35b2ba4deb5c4db2fb627a97fb54b" dependencies = [ "either", "new_debug_unreachable", @@ -8053,16 +8482,16 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.137.4" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803bb435fdd532d5c931f0d487e48dbc94750d26c9336d79a6f1c04c62f08d93" +checksum = "65f21494e75d0bd8ef42010b47cabab9caaed8f2207570e809f6f4eb51a710d1" dependencies = [ "better_scoped_tls", - "bitflags 2.5.0", - "indexmap 2.2.6", + "bitflags 2.6.0", + "indexmap 2.6.0", "once_cell", "phf", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "smallvec", "swc_atoms", @@ -8076,9 +8505,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.126.4" +version = "0.134.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486479e75907547d4c65ca6deed8faa465a2e9475cc9605be36a0e5eb609f578" +checksum = "3c3d884594385bea9405a2e1721151470d9a14d3ceec5dd773c0ca6894791601" dependencies = [ "swc_atoms", "swc_common", @@ -8090,24 +8519,24 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" +checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "swc_ecma_transforms_proposal" -version = "0.171.4" +version = "0.179.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2822bc6c28bb1a96090a3b2caa28f45efbaecb333714d30868a2390eaae943f" +checksum = "79938ff510fc647febd8c6c3ef4143d099fdad87a223680e632623d056dae2dd" dependencies = [ "either", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "smallvec", "swc_atoms", @@ -8122,17 +8551,18 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.183.4" +version = "0.191.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8984ebb8955116c426457a0c70b0aa9a08a06656e245781ff617a9cd1e289697" +checksum = "76c76d8b9792ce51401d38da0fa62158d61f6d80d16d68fe5b03ce4bf5fba383" dependencies = [ "base64 0.21.7", "dashmap", - "indexmap 2.2.6", + "indexmap 2.6.0", "once_cell", "serde", - "sha-1", + "sha1", "string_enum", + "swc_allocator", "swc_atoms", "swc_common", "swc_config", @@ -8146,9 +8576,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.188.4" +version = "0.198.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e898fbab993abb60fb67009521908f2317f1d33f804e5b38d769f52e58572e" +checksum = "15455da4768f97186c40523e83600495210c11825d3a44db43383fd81eace88d" dependencies = [ "ryu-js", "serde", @@ -8163,14 +8593,15 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.127.4" +version = "0.134.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e77ea18468895d26bd38656885860fede2acd24d1687f64363aaf8910441" +checksum = "029eec7dd485923a75b5a45befd04510288870250270292fc2c1b3a9e7547408" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "num_cpus", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", + "ryu-js", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -8181,10 +8612,11 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.98.2" +version = "0.104.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb71511a816c7c84ddc96e6939389be261caf20858486a5e76948551f110e1f" +checksum = "5b1c6802e68e51f336e8bc9644e9ff9da75d7da9c1a6247d532f2e908aa33e81" dependencies = [ + "new_debug_unreachable", "num-bigint", "swc_atoms", "swc_common", @@ -8195,48 +8627,47 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" +checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "swc_macros_common" -version = "0.3.9" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" +checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "swc_visit" -version = "0.5.8" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" +checksum = "1ceb044142ba2719ef9eb3b6b454fce61ab849eb696c34d190f04651955c613d" dependencies = [ "either", - "swc_visit_macros", + "new_debug_unreachable", ] [[package]] name = "swc_visit_macros" -version = "0.5.9" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" +checksum = "92807d840959f39c60ce8a774a3f83e8193c658068e6d270dbe0a05e40e90b41" dependencies = [ "Inflector", - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -8252,9 +8683,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.65" +version = "2.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +checksum = "198514704ca887dd5a1e408c6c6cdcba43672f9b4062e1b24aa34e74e6d7faae" dependencies = [ "proc-macro2", "quote", @@ -8270,7 +8701,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -8284,6 +8715,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -8293,7 +8727,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -8302,7 +8736,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -8310,20 +8744,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "sysinfo" -version = "0.30.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "windows", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -8332,7 +8752,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -8345,6 +8776,157 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tantivy" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" +dependencies = [ + "aho-corasick", + "arc-swap", + "base64 0.22.1", + "bitpacking", + "byteorder", + "census", + "crc32fast", + "crossbeam-channel", + "downcast-rs", + "fastdivide", + "fnv", + "fs4", + "htmlescape", + "itertools 0.12.1", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", + "num_cpus", + "once_cell", + "oneshot", + "rayon", + "regex", + "rust-stemmers", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "sketches-ddsketch", + "smallvec", + "tantivy-bitpacker", + "tantivy-columnar", + "tantivy-common", + "tantivy-fst", + "tantivy-query-grammar", + "tantivy-stacker", + "tantivy-tokenizer-api", + "tempfile", + "thiserror", + "time", + "uuid 1.11.0", + "winapi", +] + +[[package]] +name = "tantivy-bitpacker" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" +dependencies = [ + "bitpacking", +] + +[[package]] +name = "tantivy-columnar" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" +dependencies = [ + "downcast-rs", + "fastdivide", + "itertools 0.12.1", + "serde", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-sstable", + "tantivy-stacker", +] + +[[package]] +name = "tantivy-common" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" +dependencies = [ + "async-trait", + "byteorder", + "ownedbytes", + "serde", + "time", +] + +[[package]] +name = "tantivy-fst" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" +dependencies = [ + "byteorder", + "regex-syntax 0.8.5", + "utf8-ranges", +] + +[[package]] +name = "tantivy-query-grammar" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" +dependencies = [ + "nom", +] + +[[package]] +name = "tantivy-sstable" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" +dependencies = [ + "tantivy-bitpacker", + "tantivy-common", + "tantivy-fst", + "zstd 0.13.2", +] + +[[package]] +name = "tantivy-stacker" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" +dependencies = [ + "murmurhash32", + "rand_distr", + "tantivy-common", +] + +[[package]] +name = "tantivy-tokenizer-api" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" +dependencies = [ + "serde", +] + [[package]] name = "tap" version = "1.0.1" @@ -8353,31 +8935,26 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", "xattr", ] -[[package]] -name = "target-features" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" - [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -8400,22 +8977,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -8428,6 +9005,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "ordered-float", +] + [[package]] name = "tiberius" version = "0.12.2" @@ -8446,14 +9034,14 @@ dependencies = [ "once_cell", "pin-project-lite", "pretty-hex", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "thiserror", "tokio", "tokio-rustls 0.24.1", "tokio-util", "tracing", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] @@ -8540,9 +9128,9 @@ dependencies = [ [[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", ] @@ -8603,9 +9191,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.32.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777d57dcc6bb4cf084e3212e1858447222aa451f21b5e2452497d9100da65b91" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -8623,24 +9211,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", -] - -[[package]] -name = "tokio-metrics" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb585a0069b53171684e22d5255984ec30d1c7304fd0a4a9a603ffd8c765cdd" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", + "syn 2.0.81", ] [[package]] @@ -8655,9 +9232,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +checksum = "3b5d3742945bc7d7f210693b0c58ae542c6fd47b17adbbda0885f3dcb34a6bdb" dependencies = [ "async-trait", "byteorder", @@ -8691,20 +9268,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.4", + "rustls 0.23.15", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-socks" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", @@ -8714,9 +9291,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", @@ -8739,10 +9316,24 @@ dependencies = [ ] [[package]] -name = "tokio-util" -version = "0.7.11" +name = "tokio-tungstenite" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -8766,21 +9357,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -8791,7 +9382,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -8800,26 +9391,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" -dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.20", ] [[package]] @@ -8848,6 +9428,21 @@ dependencies = [ "tokio", "tower-layer", "tower-service", +] + +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tower-layer", + "tower-service", "tracing", ] @@ -8874,10 +9469,10 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "pin-project-lite", "tower-layer", @@ -8886,16 +9481,36 @@ dependencies = [ ] [[package]] -name = "tower-layer" -version = "0.3.2" +name = "tower-http" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" +dependencies = [ + "async-compression 0.4.16", + "bitflags 2.6.0", + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -8909,6 +9524,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + [[package]] name = "tracing-attributes" version = "0.1.27" @@ -8917,7 +9544,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] @@ -8975,12 +9602,12 @@ dependencies = [ [[package]] name = "tracing-loki" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49bbc87d08020d7c2a9f4bb0b7d10da5381d3867f8ae57fcc54621b34567e963" +checksum = "fea6023f9fe4b69267ccd3ed7d203d931c43c5f82dbaa0f07202bc17193a5f43" dependencies = [ "loki-api", - "reqwest 0.11.20", + "reqwest 0.12.8", "serde", "serde_json", "snap", @@ -9027,20 +9654,87 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" dependencies = [ "serde", "stable_deref_trait", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "serde", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "serde", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -9087,7 +9781,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.65", + "syn 2.0.81", "thiserror", "unicode-ident", ] @@ -9104,19 +9798,19 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.65", + "syn 2.0.81", "typify-impl", ] [[package]] name = "ulid" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" dependencies = [ "getrandom 0.2.15", "rand 0.8.5", - "uuid 1.8.0", + "uuid 1.11.0", "web-time", ] @@ -9186,42 +9880,39 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-id" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" +checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561" [[package]] name = "unicode-id-start" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f73150333cb58412db36f2aca8f2875b013049705cc77b94ded70a1ab1f5da" +checksum = "97e2a3c5fc9de285c0e805d98eba666adb4b2d9e1049ce44821ff7707cc34e91" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -9236,31 +9927,28 @@ dependencies = [ ] [[package]] -name = "unicode-reverse" -version = "1.0.9" +name = "unicode-properties" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" -dependencies = [ - "unicode-segmentation", -] +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -9270,9 +9958,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "unicode_names2" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" +checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd" dependencies = [ "phf", "unicode_names2_generator", @@ -9280,9 +9968,9 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" +checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e" dependencies = [ "getopts", "log", @@ -9310,32 +9998,31 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", "log", "native-tls", "once_cell", - "rustls 0.22.4", + "rustls 0.23.15", "rustls-pki-types", - "rustls-webpki 0.102.4", "serde", "serde_json", "url", - "webpki-roots 0.26.1", + "webpki-roots 0.26.6", ] [[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", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -9348,11 +10035,10 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "urlpattern" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" dependencies = [ - "derive_more", "regex", "serde", "unic-ucd-ident", @@ -9360,10 +10046,22 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf-8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -9376,9 +10074,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom 0.2.15", "serde", @@ -9386,14 +10084,19 @@ dependencies = [ [[package]] name = "v8" -version = "0.83.2" +version = "0.106.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6c8a960dd2eb74b22eda64f7e9f3d1688f82b80202828dc0425ebdeda826ef" +checksum = "a381badc47c6f15acb5fe0b5b40234162349ed9d4e4fd7c83a7f5547c0fc69c5" dependencies = [ - "bitflags 2.5.0", + "bindgen 0.69.5", + "bitflags 2.6.0", "fslock", + "gzip-header", + "home", + "miniz_oxide 0.7.4", "once_cell", - "which 5.0.0", + "paste", + "which 6.0.3", ] [[package]] @@ -9416,9 +10119,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vsimd" @@ -9471,9 +10174,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[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", @@ -9481,24 +10184,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.65", + "syn 2.0.81", "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", @@ -9508,9 +10211,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", @@ -9518,28 +10221,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.65", + "syn 2.0.81", "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-bindgen-test" -version = "0.3.39" +version = "0.3.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" +checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" dependencies = [ "console_error_panic_hook", "js-sys", @@ -9551,33 +10254,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.39" +version = "0.3.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" +checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -9597,9 +10287,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -9623,9 +10313,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -9639,33 +10329,38 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.34", + "rustix", ] [[package]] name = "which" -version = "5.0.0" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", - "once_cell", - "rustix 0.38.34", - "windows-sys 0.48.0", + "rustix", + "winsafe", ] [[package]] name = "whoami" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.4.1", + "redox_syscall 0.5.7", "wasite", "web-sys", ] +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + [[package]] name = "winapi" version = "0.3.9" @@ -9684,11 +10379,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -9699,7 +10394,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "axum", @@ -9711,11 +10406,12 @@ dependencies = [ "gethostname", "git-version", "lazy_static", + "object_store", "once_cell", - "pg-embed", "prometheus", + "quote", "rand 0.8.5", - "reqwest 0.12.4", + "reqwest 0.12.8", "rsmq_async", "serde", "serde_json", @@ -9725,21 +10421,21 @@ dependencies = [ "tikv-jemalloc-sys", "tikv-jemallocator", "tokio", - "tokio-metrics", "tracing", "url", - "uuid 1.8.0", + "uuid 1.11.0", "windmill-api", "windmill-api-client", "windmill-common", "windmill-git-sync", + "windmill-indexer", "windmill-queue", "windmill-worker", ] [[package]] name = "windmill-api" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "argon2", @@ -9749,37 +10445,41 @@ dependencies = [ "async-stripe", "async_zip", "axum", + "base32", "base64 0.21.7", "bytes", "candle-core", "candle-nn", "candle-transformers", "chrono", - "chrono-tz 0.9.0", + "chrono-tz 0.10.0", "cookie 0.17.0", - "crc", "cron", + "datafusion", "futures", "git-version", "hex", "hf-hub", "hmac", "http 1.1.0", - "hyper 1.3.1", + "hyper 1.5.0", "itertools 0.13.0", + "jsonwebtoken", "lazy_static", "magic-crypt", + "mail-parser", + "matchit", "mime_guess", + "native-tls", "object_store", "openidconnect", + "openssl", "pin-project", - "polars", - "polars-io", "prometheus", "quick_cache", "rand 0.8.5", "regex", - "reqwest 0.12.4", + "reqwest 0.12.8", "rsa 0.7.2", "rsmq_async", "rust-embed", @@ -9795,18 +10495,23 @@ dependencies = [ "tinyvector", "tokenizers", "tokio", + "tokio-native-tls", "tokio-tar", + "tokio-tungstenite", "tokio-util", - "tower", + "tower 0.5.1", "tower-cookies", - "tower-http", + "tower-http 0.5.2", "tracing", "tracing-subscriber", + "ulid", + "url", "urlencoding", - "uuid 1.8.0", + "uuid 1.11.0", "windmill-audit", "windmill-common", "windmill-git-sync", + "windmill-indexer", "windmill-parser", "windmill-parser-py-imports", "windmill-parser-ts", @@ -9815,7 +10520,7 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.333.2" +version = "1.410.3" dependencies = [ "base64 0.21.7", "chrono", @@ -9824,16 +10529,16 @@ dependencies = [ "progenitor", "progenitor-client", "rand 0.8.5", - "reqwest 0.11.20", + "reqwest 0.11.27", "serde", "serde_json", "syn 1.0.109", - "uuid 1.8.0", + "uuid 1.11.0", ] [[package]] name = "windmill-audit" -version = "1.333.2" +version = "1.410.3" dependencies = [ "chrono", "serde", @@ -9846,20 +10551,25 @@ dependencies = [ [[package]] name = "windmill-common" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", + "async-stream", "aws-config", "aws-sdk-sts", "axum", "bytes", "chrono", + "const_format", + "crc", "cron", + "futures-core", + "gethostname", "git-version", "hex", "hmac", - "hyper 1.3.1", - "indexmap 2.2.6", + "hyper 1.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "lazy_static", "magic-crypt", @@ -9868,23 +10578,26 @@ dependencies = [ "prometheus", "rand 0.8.5", "regex", - "reqwest 0.12.4", + "reqwest 0.12.8", "serde", "serde_json", "sha2 0.10.8", "sqlx", "thiserror", + "tikv-jemalloc-ctl", "tokio", "tracing", + "tracing-appender", "tracing-flame", "tracing-loki", "tracing-subscriber", - "uuid 1.8.0", + "uuid 1.11.0", + "windmill-macros", ] [[package]] name = "windmill-git-sync" -version = "1.333.2" +version = "1.410.3" dependencies = [ "regex", "rsmq_async", @@ -9892,33 +10605,69 @@ dependencies = [ "serde_json", "sqlx", "tracing", - "uuid 1.8.0", + "uuid 1.11.0", "windmill-common", "windmill-queue", ] [[package]] -name = "windmill-parser" -version = "1.333.2" +name = "windmill-indexer" +version = "1.410.3" dependencies = [ + "anyhow", + "bytes", + "chrono", + "futures", + "lazy_static", + "object_store", + "serde", + "serde_json", + "sqlx", + "tantivy", + "tempfile", + "tokio", + "tokio-tar", + "tracing", + "uuid 1.11.0", + "windmill-common", +] + +[[package]] +name = "windmill-macros" +version = "1.410.3" +dependencies = [ + "itertools 0.13.0", + "lazy_static", + "proc-macro2", + "quote", + "regex", + "syn 2.0.81", +] + +[[package]] +name = "windmill-parser" +version = "1.410.3" +dependencies = [ + "convert_case 0.6.0", "serde", "serde_json", ] [[package]] name = "windmill-parser-bash" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "lazy_static", "regex", + "regex-lite", "serde_json", "windmill-parser", ] [[package]] name = "windmill-parser-go" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "gosyn", @@ -9930,32 +10679,30 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "lazy_static", "regex", + "regex-lite", "serde_json", "windmill-parser", ] [[package]] name = "windmill-parser-php" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", - "convert_case 0.6.0", "itertools 0.13.0", - "lazy_static", "php-parser-rs", - "regex", "serde_json", "windmill-parser", ] [[package]] name = "windmill-parser-py" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "itertools 0.13.0", @@ -9966,7 +10713,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "async-recursion", @@ -9974,6 +10721,7 @@ dependencies = [ "lazy_static", "phf", "regex", + "regex-lite", "rustpython-parser", "serde_json", "sqlx", @@ -9981,23 +10729,40 @@ dependencies = [ "windmill-parser", ] +[[package]] +name = "windmill-parser-rust" +version = "1.410.3" +dependencies = [ + "anyhow", + "convert_case 0.6.0", + "itertools 0.13.0", + "lazy_static", + "pulldown-cmark", + "quote", + "regex", + "serde_json", + "syn 2.0.81", + "toml 0.7.8", + "windmill-parser", +] + [[package]] name = "windmill-parser-sql" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "lazy_static", "regex", + "regex-lite", "serde_json", "windmill-parser", ] [[package]] name = "windmill-parser-ts" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", - "convert_case 0.6.0", "lazy_static", "regex", "serde-wasm-bindgen", @@ -10006,13 +10771,14 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_parser", "swc_ecma_visit", + "triomphe", "wasm-bindgen", "windmill-parser", ] [[package]] name = "windmill-parser-wasm" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "getrandom 0.2.15", @@ -10025,20 +10791,32 @@ dependencies = [ "windmill-parser-graphql", "windmill-parser-php", "windmill-parser-py", + "windmill-parser-rust", "windmill-parser-sql", "windmill-parser-ts", + "windmill-parser-yaml", +] + +[[package]] +name = "windmill-parser-yaml" +version = "1.410.3" +dependencies = [ + "anyhow", + "serde_json", + "windmill-parser", + "yaml-rust", ] [[package]] name = "windmill-queue" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "async-recursion", "axum", - "bigdecimal 0.4.3", + "bigdecimal", "chrono", - "chrono-tz 0.9.0", + "chrono-tz 0.10.0", "cron", "futures-core", "hex", @@ -10047,7 +10825,7 @@ dependencies = [ "lazy_static", "prometheus", "regex", - "reqwest 0.12.4", + "reqwest 0.12.8", "rsmq_async", "serde", "serde_json", @@ -10057,16 +10835,15 @@ dependencies = [ "tokio", "tracing", "ulid", - "uuid 1.8.0", + "uuid 1.11.0", "windmill-audit", "windmill-common", ] [[package]] name = "windmill-sql-datatype-parser-wasm" -version = "1.333.2" +version = "1.410.3" dependencies = [ - "serde", "wasm-bindgen", "wasm-bindgen-test", "windmill-parser", @@ -10075,7 +10852,7 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.333.2" +version = "1.410.3" dependencies = [ "anyhow", "async-recursion", @@ -10089,6 +10866,7 @@ dependencies = [ "deno_console", "deno_core", "deno_fetch", + "deno_net", "deno_tls", "deno_url", "deno_web", @@ -10102,6 +10880,7 @@ dependencies = [ "itertools 0.13.0", "jsonwebtoken", "lazy_static", + "mappable-rc", "mysql_async", "native-tls", "nix", @@ -10113,13 +10892,14 @@ dependencies = [ "prometheus", "rand 0.8.5", "regex", - "reqwest 0.12.4", + "reqwest 0.12.8", "rsmq_async", "rust_decimal", "serde", "serde_json", "sha2 0.10.8", "sqlx", + "swc_ecma_parser", "tar", "tiberius", "tokio", @@ -10127,7 +10907,7 @@ dependencies = [ "tokio-util", "tracing", "urlencoding", - "uuid 1.8.0", + "uuid 1.11.0", "windmill-audit", "windmill-common", "windmill-git-sync", @@ -10138,19 +10918,13 @@ dependencies = [ "windmill-parser-php", "windmill-parser-py", "windmill-parser-py-imports", + "windmill-parser-rust", "windmill-parser-sql", "windmill-parser-ts", + "windmill-parser-yaml", "windmill-queue", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core", - "windows-targets 0.52.5", + "yaml-rust", + "zstd 0.12.4", ] [[package]] @@ -10159,7 +10933,37 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -10177,7 +10981,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -10197,18 +11010,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -10219,9 +11032,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -10231,9 +11044,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -10243,15 +11056,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -10261,9 +11074,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -10273,9 +11086,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -10285,9 +11098,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -10297,9 +11110,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -10312,9 +11125,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -10330,14 +11143,10 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.52.0" +name = "winsafe" +version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] name = "wyz" @@ -10355,8 +11164,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "linux-raw-sys", + "rustix", ] [[package]] @@ -10365,12 +11174,6 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" -[[package]] -name = "xxhash-rust" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" - [[package]] name = "xz2" version = "0.1.7" @@ -10380,6 +11183,15 @@ dependencies = [ "lzma-sys", ] +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "yansi" version = "0.5.1" @@ -10388,9 +11200,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yoke" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ "serde", "stable_deref_trait", @@ -10400,62 +11212,63 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", ] [[package]] name = "zerofrom" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.81", "synstructure", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" @@ -10463,18 +11276,9 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.8.4", "byteorder", - "bzip2", - "constant_time_eq", "crc32fast", "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -10488,11 +11292,20 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe 7.1.0", + "zstd-safe 6.0.6", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe 7.2.1", ] [[package]] @@ -10507,18 +11320,28 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.1.0" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windmill/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/windmill/package.nix index d576f2699b..b6f4d07bd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windmill/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windmill/package.nix @@ -1,36 +1,37 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, buildNpmPackage -, bash -, cmake -, cairo -, deno -, fetchurl -, go -, lld -, makeWrapper -, nsjail -, openssl -, pango -, pixman -, giflib -, pkg-config -, python3 -, rustfmt -, stdenv -, swagger-cli +{ + lib, + rustPlatform, + fetchFromGitHub, + buildNpmPackage, + bash, + cmake, + cairo, + deno, + fetchurl, + go, + lld, + makeWrapper, + nsjail, + openssl, + pango, + pixman, + giflib, + pkg-config, + python3, + rustfmt, + stdenv, + swagger-cli, }: let pname = "windmill"; - version = "1.333.2"; + version = "1.410.3"; src = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-QwjmkKe3jxgXQjj/+WlhOdGOXZsrYdRmHtVakoNqYtI="; + hash = "sha256-QPabzgSs+zxgI2dHcMY9ki4jEwm5jQbzwSMaIfBbFG8="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -42,18 +43,26 @@ let sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-I9h2MvngsluWYaoOP44ufE82SFW+8yhNI2qQNi6oyZE="; + npmDepsHash = "sha256-3AeDGd/4dGHm8kGKEH3sqNOuQ1LPjP5n4qOEaqVMm0w="; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory - env.NODE_OPTIONS="--max-old-space-size=8192"; + env.NODE_OPTIONS = "--max-old-space-size=8192"; preBuild = '' npm run generate-backend-client ''; - buildInputs = [ pixman cairo pango giflib ]; - nativeBuildInputs = [ python3 pkg-config ]; + buildInputs = [ + pixman + cairo + pango + giflib + ]; + nativeBuildInputs = [ + python3 + pkg-config + ]; installPhase = '' mkdir -p $out/share @@ -69,11 +78,14 @@ rustPlatform.buildRustPackage { SQLX_OFFLINE = "true"; RUSTY_V8_ARCHIVE = let - fetch_librusty_v8 = args: + fetch_librusty_v8 = + args: fetchurl { name = "librusty_v8-${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; - sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); + sha256 = + args.shas.${stdenv.hostPlatform.system} + or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); meta = { inherit (args) version; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; @@ -94,8 +106,6 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "archiver-rs-0.5.1" = "sha256-ZIik0mMABmhdx/ullgbOrKH5GAtqcOKq5A6vB7aBSjk="; - "pg-embed-0.7.2" = "sha256-R/SrlzNK7aAOyXVTQ/WPkiQb6FyMg9tpsmPTsiossDY="; "php-parser-rs-0.1.3" = "sha256-ZeI3KgUPmtjlRfq6eAYveqt8Ay35gwj6B9iOQRjQa9A="; "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; "rustpython-ast-0.3.1" = "sha256-q9N+z3F6YICQuUMp3a10OS792tCq0GiSSlkcaLxi3Gs="; @@ -148,11 +158,19 @@ rustPlatform.buildRustPackage { doCheck = false; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [openssl]} $out/bin/windmill + patchelf --set-rpath ${lib.makeLibraryPath [ openssl ]} $out/bin/windmill wrapProgram "$out/bin/windmill" \ - --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [stdenv.cc.cc.lib]} \ + --prefix PATH : ${ + lib.makeBinPath [ + go + pythonEnv + deno + nsjail + bash + ] + } \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]} \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ @@ -164,9 +182,16 @@ rustPlatform.buildRustPackage { description = "Open-source developer platform to turn scripts into workflows and UIs"; homepage = "https://windmill.dev"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ dit7ya happysalada ]; + maintainers = with lib.maintainers; [ + dit7ya + happysalada + ]; mainProgram = "windmill"; # limited by librusty_v8 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + # nsjail not available on darwin + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wivrn/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wivrn/package.nix new file mode 100644 index 0000000000..f795ec72b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/wivrn/package.nix @@ -0,0 +1,149 @@ +{ + config, + lib, + stdenv, + fetchFromGitHub, + fetchFromGitLab, + applyPatches, + autoAddDriverRunpath, + avahi, + boost, + cli11, + cmake, + cudaPackages ? { }, + cudaSupport ? config.cudaSupport, + eigen, + ffmpeg, + freetype, + git, + glm, + glslang, + harfbuzz, + libdrm, + libGL, + libva, + libpulseaudio, + libX11, + libXrandr, + nix-update-script, + nlohmann_json, + onnxruntime, + openxr-loader, + pipewire, + pkg-config, + python3, + shaderc, + spdlog, + systemd, + udev, + vulkan-headers, + vulkan-loader, + vulkan-tools, + x264, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "wivrn"; + version = "0.19"; + + src = fetchFromGitHub { + owner = "wivrn"; + repo = "wivrn"; + rev = "v${finalAttrs.version}"; + hash = "sha256-DYV+JUWjjhLZLq+4Hv7jxOyxDqQut/mU1X0ZFMoNkDI="; + }; + + monado = applyPatches { + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "monado"; + repo = "monado"; + rev = "bcbe19ddd795f182df42051e5495e9727db36c1c"; + hash = "sha256-sh5slHROcuC3Dgenu1+hm8U5lUOW48JUbiluYvc3NiQ="; + }; + + patches = [ + "${finalAttrs.src}/patches/monado/0001-c-multi-disable-dropping-of-old-frames.patch" + "${finalAttrs.src}/patches/monado/0002-ipc-server-Always-listen-to-stdin.patch" + "${finalAttrs.src}/patches/monado/0003-c-multi-Don-t-log-frame-time-diff.patch" + "${finalAttrs.src}/patches/monado/0005-distortion-images.patch" + "${finalAttrs.src}/patches/monado/0008-Use-mipmaps-for-distortion-shader.patch" + "${finalAttrs.src}/patches/monado/0009-convert-to-YCbCr-in-monado.patch" + ]; + }; + + strictDeps = true; + + postUnpack = '' + # Let's make sure our monado source revision matches what is used by WiVRn upstream + ourMonadoRev="${finalAttrs.monado.src.rev}" + theirMonadoRev=$(grep "GIT_TAG" ${finalAttrs.src.name}/CMakeLists.txt | awk '{print $2}') + if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then + echo "Our Monado source revision doesn't match CMakeLists.txt." >&2 + echo " theirs: $theirMonadoRev" >&2 + echo " ours: $ourMonadoRev" >&2 + return 1 + fi + ''; + + nativeBuildInputs = [ + cmake + git + glslang + pkg-config + python3 + ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; + + buildInputs = [ + avahi + boost + cli11 + eigen + ffmpeg + freetype + glm + harfbuzz + libdrm + libGL + libva + libX11 + libXrandr + libpulseaudio + nlohmann_json + onnxruntime + openxr-loader + pipewire + shaderc + spdlog + systemd + udev + vulkan-headers + vulkan-loader + vulkan-tools + x264 + ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit ]; + + cmakeFlags = [ + (lib.cmakeBool "WIVRN_USE_VAAPI" true) + (lib.cmakeBool "WIVRN_USE_X264" true) + (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport) + (lib.cmakeBool "WIVRN_USE_SYSTEMD" true) + (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true) + (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true) + (lib.cmakeBool "WIVRN_BUILD_CLIENT" false) + (lib.cmakeBool "WIVRN_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "An OpenXR streaming application to a standalone headset"; + homepage = "https://github.com/Meumeu/WiVRn/"; + changelog = "https://github.com/Meumeu/WiVRn/releases/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ passivelemon ]; + platforms = platforms.linux; + mainProgram = "wivrn-server"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix b/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix index c18ef2dd97..65845f5dc1 100644 --- a/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ld2+WUVJ2DtiwWmsxkYsU3ft3knHJvjMwSwZlk7reG8="; + hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/third_party/nixpkgs/pkgs/by-name/wr/writefreely/package.nix similarity index 54% rename from third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix rename to third_party/nixpkgs/pkgs/by-name/wr/writefreely/package.nix index 0f8d3b6fac..f952481f82 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wr/writefreely/package.nix @@ -1,29 +1,36 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: buildGoModule rec { pname = "writefreely"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "writefreely"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7KTNimthtfmQCgyXevAEj+CZ2MS+uOby73OO1fGNXfs="; + sha256 = "sha256-Qr31XSbAckLElD81yxD+K7tngWECQ+wyuESC+biAbyw="; }; - vendorHash = "sha256-6RTshhxX+w/gdK53wCHVMpm6EkkRtEJ2/Fe7MfZ0WvY="; + vendorHash = "sha256-HmEh8WmKbdAimvzsAiaXcqSXoU1DJx06+s1EH1JZmwo="; - patches = [ - ./fix-go-version-error.patch + ldflags = [ + "-s" + "-w" + "-X github.com/writefreely/writefreely.softwareVer=${version}" ]; - ldflags = [ "-s" "-w" "-X github.com/writefreely/writefreely.softwareVer=${version}" ]; - tags = [ "sqlite" ]; subPackages = [ "cmd/writefreely" ]; - passthru.tests = { inherit (nixosTests) writefreely; }; + passthru.tests = { + inherit (nixosTests) writefreely; + }; meta = with lib; { description = "Build a digital writing community"; diff --git a/third_party/nixpkgs/pkgs/by-name/x5/x509-limbo/package.nix b/third_party/nixpkgs/pkgs/by-name/x5/x509-limbo/package.nix deleted file mode 100644 index 0971d8b6cd..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/x5/x509-limbo/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonPackage { - pname = "x509-limbo"; - version = "unstable-2024-03-13"; - pyproject = true; - - src = fetchFromGitHub { - owner = "C2SP"; - repo = "x509-limbo"; - rev = "a04fb05cf132e1405f71c12616cf0aead829909a"; - hash = "sha256-TA4ciHkXg/RKzcIs2bwpx7CxsQDyQMG636Rr74xPsBA="; - }; - - dependencies = with python3.pkgs; [ - flit-core - - requests - pydantic - jinja2 - cryptography - pyopenssl - pyyaml - certvalidator - certifi - ]; - - postInstall = '' - mkdir -p $out/share - cp limbo.json $out/share/ - - wrapProgram $out/bin/limbo \ - --append-flags "--limbo $out/share/limbo.json" - ''; - - meta = with lib; { - homepage = "https://x509-limbo.com/"; - description = "Suite of testvectors for X.509 certificate path validation and tools for building them"; - mainProgram = "limbo"; - - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ baloo ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xchm/package.nix similarity index 90% rename from third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix rename to third_party/nixpkgs/pkgs/by-name/xc/xchm/package.nix index 33f8978820..fe94ac94ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xc/xchm/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.36"; + version = "1.37"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "sha256-+RbFE/jOD8sofHMCFgTIfgokrXYqDbCSSnN6SdEZ/b0="; + sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix index 7a61d509a9..bf718efa9f 100644 --- a/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "xeol"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; rev = "refs/tags/v${version}"; - hash = "sha256-5QlHfchVRFNpU/sBTS9AWOENU86jBatF6KI97NoJa50="; + hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k="; }; vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs="; diff --git a/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix b/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix index 428cc3a865..19194ffabd 100644 --- a/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -1,31 +1,38 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, xwayland -, xcb-util-cursor -, libxcb -, nix-update-script -, makeWrapper +{ + lib, + fetchFromGitHub, + libxcb, + makeBinaryWrapper, + pkg-config, + rustPlatform, + unstableGitUpdater, + xcb-util-cursor, + xwayland, + withSystemd ? true, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "xwayland-satellite"; - version = "0.4"; + version = "0.4-unstable-2024-09-15"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; - rev = "v${version}"; - hash = "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI="; + rev = "b962a0f33b503aa39c9cf6919f488b664e5b79b4"; + hash = "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY="; }; - cargoHash = "sha256-nKPSkHbh73xKWNpN/OpDmLnVmA3uygs3a+ejOhwU3yA="; + postPatch = '' + substituteInPlace resources/xwayland-satellite.service \ + --replace-fail '/usr/local/bin' "$out/bin" + ''; + + cargoHash = "sha256-1EtwGMoLfYK0VZj8jdQiweO/RHGBzyEoeMEI4pmqfu8="; nativeBuildInputs = [ + makeBinaryWrapper pkg-config rustPlatform.bindgenHook - makeWrapper ]; buildInputs = [ @@ -33,30 +40,36 @@ rustPlatform.buildRustPackage rec { xcb-util-cursor ]; - # disable Xwayland integration tests which need a running display server - checkFlags = [ - "--exact" - "--skip=copy_from_wayland" - "--skip=copy_from_x11" - "--skip=input_focus" - "--skip=quick_delete" - "--skip=reparent" - "--skip=toplevel_flow" - ]; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withSystemd "systemd"; - postInstall = '' - wrapProgram $out/bin/xwayland-satellite \ - --prefix PATH : "${lib.makeBinPath [xwayland]}" + # All integration tests require a running display server + doCheck = false; + + postInstall = lib.optionalString withSystemd '' + install -Dm0644 resources/xwayland-satellite.service -t $out/lib/systemd/user ''; - passthru.updateScript = nix-update-script { }; + postFixup = '' + wrapProgram $out/bin/xwayland-satellite \ + --prefix PATH : "${lib.makeBinPath [ xwayland ]}" + ''; - meta = with lib; { - description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + + meta = { + description = "Xwayland outside your Wayland compositor"; + longDescription = '' + Grants rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base. + ''; homepage = "https://github.com/Supreeeme/xwayland-satellite"; - license = licenses.mpl20; - maintainers = with maintainers; [ if-loop69420 sodiboo ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + if-loop69420 + sodiboo + getchoo + ]; mainProgram = "xwayland-satellite"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yara-x/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yara-x/package.nix index 1bf147df83..4d5110d289 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yara-x/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-W5qZHPNfRe9RmsmRzA8xGPvLl6JCoVJ59N87p2ZnXGo="; + hash = "sha256-HZA4olgHYTlPnTZNGxQNQlGX//XgqslHOMOil5G76xs="; }; - cargoHash = "sha256-ofmTDO11hqr95vSKRtJgMZL2BeA4AkCRNLknzr4n88I="; + cargoHash = "sha256-l66vRrFxwxVThBy98RWIpUi6SJkPH6VZLd5fkq5AStU="; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix b/third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix index 73df89af52..f1f15c9d3b 100644 --- a/third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - hash = "sha256-3sX1xNfblmIXI1hiXL9bhA4+CobUZ5xhpJFKugzwlGE="; + hash = "sha256-Xyuqvz3/3RgSY6LSXUSNX0f6SuRdmmgScW8URVOPijo="; }; - vendorHash = "sha256-HBl30BnSERivIHb3dbfhDwwBvs3MUkltDf+R790vSGE="; + vendorHash = "sha256-EO+ab4bptcDxGTx7y1rEvYJLtiTalXyyR71U6O9OkEA="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix index 476a49f327..358e51f8ab 100644 --- a/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.2.41254"; + version = "2024.3.47197"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-17IukQTBKspspVDyHpv8DtkAnuAHrB+rXenu8h7Yfno="; + hash = "sha256-/XTZERUPA7AEvWQsnjDXDVVkmiEn+0D8qgQkOzTJFaA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/yt/yt-dlp/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/yt-dlp/package.nix index b6dfe89c80..3f1b836dac 100644 --- a/third_party/nixpkgs/pkgs/by-name/yt/yt-dlp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.10.7"; + version = "2024.10.22"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-C68atRfJdI1+M3ztkcVUPDb8FiRqnr7awy6/IMGZjOs="; + hash = "sha256-R7gqH9IkEbXJXvLwoa4a9Obf1zbqmf2yoOpBRFq8Yro="; }; build-system = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/yu/yutto/package.nix b/third_party/nixpkgs/pkgs/by-name/yu/yutto/package.nix index 2ce2c6042f..8c08f19adf 100644 --- a/third_party/nixpkgs/pkgs/by-name/yu/yutto/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yu/yutto/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "yutto"; - version = "2.0.0-beta.43"; + version = "2.0.0-rc.4"; pyproject = true; disabled = python3Packages.pythonOlder "3.9"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "yutto-dev"; repo = "yutto"; rev = "refs/tags/v${version}"; - hash = "sha256-ND3uE4vsFa7gPr1E2UfiebExsrj+ELN0+hqnxxOQu8Y="; + hash = "sha256-QP3sbZANsyYeZmLZSwQz6E1eysCVojRYHu/z9Szdb6U="; }; build-system = with python3Packages; [ hatchling ]; @@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec { dict2xml colorama typing-extensions + pydantic ] ++ (with httpx.optional-dependencies; http2 ++ socks); diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zenn-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zenn-cli/package.nix index e6fbacccaf..865f0bcd8d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zenn-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zenn-cli/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-FfqBe1WQc6ditizjxYLmjb8mvCjQJMpvyUDdaW29sXY="; + hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o="; }; preBuild = diff --git a/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix index 4a80ec499e..b7b3817021 100644 --- a/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - hash = "sha256-8gL0+SZwVCQRokcYwSljDHtSusYY79/T9hqJGgAK1EU="; + hash = "sha256-UjeLsc6pz1t798Qy6cliYjP0qjXvUIPotbnUm8dBrFs="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/zs/zsync2/package.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsync2/package.nix new file mode 100644 index 0000000000..70a204eafa --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/zs/zsync2/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + libgcrypt, + libcpr, + libargs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zsync2"; + version = "2.0.0-alpha-1-20230304"; + + src = fetchFromGitHub { + owner = "AppImageCommunity"; + repo = "zsync2"; + rev = finalAttrs.version; + hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0="; + }; + + patches = [ + # Add missing cstdint includes + (fetchpatch { + url = "https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch"; + hash = "sha256-iLXxD6v+pSwFKmwAEyzbYUJ3DmtpvV/DYr8kcD+t5Cg="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'VERSION "2.0.0-alpha-1"' 'VERSION "${finalAttrs.version}"' \ + --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \ + --replace-fail '' '' \ + --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libgcrypt + libcpr + libargs + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_CPR" true) + (lib.cmakeBool "USE_SYSTEM_ARGS" true) + ]; + + meta = { + description = "Rewrite of the advanced file download/sync tool zsync"; + homepage = "https://github.com/AppImageCommunity/zsync2"; + license = lib.licenses.artistic2; + mainProgram = "zsync2"; + maintainers = with lib.maintainers; [ aleksana ]; + # macro only supports linux as of now + # src/zsclient.cpp#L460 + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/zz/zziplib/package.nix b/third_party/nixpkgs/pkgs/by-name/zz/zziplib/package.nix index 154a8f2a9e..2ab8d1ffdd 100644 --- a/third_party/nixpkgs/pkgs/by-name/zz/zziplib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zz/zziplib/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.74"; + version = "0.13.78"; src = fetchFromGitHub { owner = "gdraheim"; repo = pname; rev = "v${version}"; - hash = "sha256-MjqGHzb+dsAq2PrcBhU3sv4eMX3afkgFWUbhDp+5o/s="; + hash = "sha256-8QxQrxqYO4LtB8prMqgz5a0QqvSKL7KzTkgi+VdHp6A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix index 65d44c25e9..c920a5c677 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix @@ -20,12 +20,12 @@ let "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | "comfy-wide-motion-duo" # | Slab | Wide | Duospaced | Yes | ]; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-wDcBaNXIzOQ3/LBuW3YUnx/fjtJMeI+jsxLRBlsd1M0="; + sha256 = "sha256-z9OlxeD88HuPJF88CsAy3vd1SFpJF1qh5c/0AIeMA7o="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: @@ -40,11 +40,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "v31.3.0"; - hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw="; + rev = "v31.9.1"; + hash = "sha256-eAC4afBfHfiteYCzBNGFG2U/oCA7C5CdUlQVSO9Dg6E="; }; - npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY="; + npmDepsHash = "sha256-xwGR21+CpZRFdZYz8SQrSf1tkp3fjGudoMmP5TGgEe8="; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 1a44790819..132d0b87a2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.057"; + version = "0.058"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-SSTv/cyZ+7nK0VvQPqQ+T5JXDXOZgLmv++cjHLlObb8="; + hash = "sha256-QKMTU6ISP983Kg4ZxyPV4IgiuO0ZXMiOtvZPwP7dF7k="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix deleted file mode 100644 index 885d952c32..0000000000 --- a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, nix-update-script }: - -stdenvNoCC.mkDerivation rec { - pname = "clash-geoip"; - version = "20240912"; - - src = fetchurl { - url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-3Cxq5vA53g7+LUgvSneuq7UBjdKppvcVy3fh/cOwDI8="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/etc/clash - install -Dm 0644 $src -D $out/etc/clash/Country.mmdb - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "GeoLite2 data created by MaxMind"; - homepage = "https://github.com/Dreamacro/maxmind-geoip"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix b/third_party/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix index 393fe7d2a8..cf61d30108 100644 --- a/third_party/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "unicode-character-database"; - version = "15.1.0"; + version = "16.0.0"; src = fetchurl { url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip"; - sha256 = "sha256-yxxmPQU5JlAM1QEilzYEV1JxOgZr11gCCYWYt6cFYXc="; + sha256 = "sha256-yG3YHysUpDsMwGSqX4mqckE4aAHjXFnHmE5XmDJjTrI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-kvantum/default.nix b/third_party/nixpkgs/pkgs/data/themes/catppuccin-kvantum/default.nix index 0588695b5b..169ac21471 100644 --- a/third_party/nixpkgs/pkgs/data/themes/catppuccin-kvantum/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/catppuccin-kvantum/default.nix @@ -2,37 +2,40 @@ lib, stdenvNoCC, fetchFromGitHub, - accent ? "Blue", - variant ? "Frappe", + unstableGitUpdater, + accent ? "blue", + variant ? "frappe", }: let pname = "catppuccin-kvantum"; in - lib.checkListOfEnum "${pname}: theme accent" ["Blue" "Flamingo" "Green" "Lavender" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow"] [accent] - lib.checkListOfEnum "${pname}: color variant" ["Latte" "Frappe" "Macchiato" "Mocha"] [variant] + lib.checkListOfEnum "${pname}: theme accent" ["blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow"] [accent] + lib.checkListOfEnum "${pname}: color variant" ["latte" "frappe" "macchiato" "mocha"] [variant] stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2022-07-04"; + version = "0-unstable-2024-10-10"; src = fetchFromGitHub { owner = "catppuccin"; repo = "Kvantum"; - rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; - sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + rev = "bdaa531318d5756cea5674a750a99134dad0bbbc"; + hash = "sha256-O85y8Gg0l+xQP1eQi9GizuKfLEGePZ3wPdBNR+0V4ZQ="; }; installPhase = '' runHook preInstall mkdir -p $out/share/Kvantum - cp -a src/Catppuccin-${variant}-${accent} $out/share/Kvantum + cp -a themes/catppuccin-${variant}-${accent} $out/share/Kvantum runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { description = "Soothing pastel theme for Kvantum"; homepage = "https://github.com/catppuccin/Kvantum"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bastaynav ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.bastaynav ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix index ca96a38313..e45aa28bd5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -103,7 +103,7 @@ super: lib.trivial.pipe super [ nativeBuildInputs = [ wrapGAppsHook3 ]; patches = [ (substituteAll { - inherit gjs util-linux xdg-utils; + inherit gjs; util_linux = util-linux; xdg_utils = xdg-utils; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index db6edf8df3..305c9e50ca 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.28.2"; + version = "1.28.4"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Z4pD6DeqJxhJQgT93xm7kGzwfl2A/S4d3nRfJtKtujM="; + hash = "sha256-AvCesDFMKsGXtvCJlQpXHNujm/0D1sOguP13JSqWiHQ="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gtk3 - # See https://github.com/mate-desktop/mate-panel/issues/1402 + # Optionally for the ca.desrt.dconf-editor.Settings schema # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook3 dconf-editor ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index a312c0040e..3bb9389c1e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,6 +1,5 @@ { lib , mkXfceDerivation -, fetchpatch2 , gobject-introspection , glib , gtk3 @@ -15,19 +14,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.6.2"; + version = "0.6.3"; odd-unstable = false; - sha256 = "sha256-A4siNxbTf9ObJJg8inPuH7Lo4dckLbFljV6aPFQxRto="; - - patches = [ - # shortcuts-plugin: Fix shortcuts-editor include - # https://gitlab.xfce.org/apps/mousepad/-/merge_requests/131 - (fetchpatch2 { - url = "https://gitlab.xfce.org/apps/mousepad/-/commit/d2eb43ae4d692cc4753647111eb3deebfa26abbb.patch"; - hash = "sha256-Ldn0ZVmCzqG8lOkeaazkodEMip3lTm/lJEhfsL8TyT8="; - }) - ]; + sha256 = "sha256-L1txMS86lOEE9tOPTIOr1Gh4lwH7krnAeq4f3yS5kN0="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix index 8d4eba70cc..3bf8c57b75 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix @@ -52,10 +52,13 @@ mixRelease { substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-debug-adapter - # prepare the launcher + # prepare the launchers substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ "ERL_LIBS=$out/lib:\$ERL_LIBS" \ + --replace "exec elixir" "exec ${elixir}/bin/elixir" \ + --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir" + substituteInPlace $out/lib/exec.zsh \ --replace "exec elixir" "exec ${elixir}/bin/elixir" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix index b62c114c77..e987157954 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "fasmg"; - version = "j27m"; + version = "kd3c"; src = fetchzip { url = "https://flatassembler.net/fasmg.${version}.zip"; - sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd"; + sha256 = "sha256-duxune/UjXppKf/yWp7y85rpBn4EIC6JcZPNDhScsEA="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix index 2bf6b754e2..f2c075beac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.51.0"; + version = "0.52.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-JeOw9mdmFAG0mMe8G/yanKCLPbCUPJxUBluNFFqjfbA="; + sha256 = "sha256-OJBeJyF/CmLyMNRpjcx06GB7Lc4htNTm2apbi8wQKL4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix index d34ee3af91..19d24f47da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -1,59 +1,64 @@ -{ stdenv -, llvmPackages -, lib -, fetchFromGitHub -, cmake -, libffi -, libpng -, libjpeg -, mesa -, libGL -, eigen -, openblas -, blas -, lapack +{ + stdenv, + llvmPackages, + lib, + fetchFromGitHub, + cmake, + flatbuffers, + libffi, + libpng, + libjpeg, + mesa, + libGL, + eigen, + openblas, + blas, + lapack, + pythonSupport ? false, + python3Packages ? null, }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "halide"; - version = "16.0.0"; + version = "18.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8="; + hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI="; }; - postPatch = '' - # See https://github.com/halide/Halide/issues/7785 - substituteInPlace 'src/runtime/HalideRuntime.h' \ - --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ - '#if defined(__x86_64__) || defined(__i386__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' - '' - # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. - # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether - # ::aligned_alloc is available. For us, it isn't. - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - substituteInPlace 'src/runtime/HalideBuffer.h' \ - --replace '#ifdef __APPLE__ - #include - #include - #endif' \ - ' ' \ - --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ - '1' \ - --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ - '0' - ''; + postPatch = + '' + # See https://github.com/halide/Halide/issues/7785 + substituteInPlace 'src/runtime/HalideRuntime.h' \ + --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ + '#if defined(__x86_64__) || defined(__i386__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' + '' + # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. + # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether + # ::aligned_alloc is available. For us, it isn't. + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + substituteInPlace 'src/runtime/HalideBuffer.h' \ + --replace '#ifdef __APPLE__ + #include + #include + #endif' \ + ' ' \ + --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ + '1' \ + --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ + '0' + ''; cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" - "-DWITH_PYTHON_BINDINGS=OFF" + "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" "-DTARGET_WEBASSEMBLY=OFF" # Disable performance tests since they may fail on busy machines "-DWITH_TEST_PERFORMANCE=OFF" @@ -61,41 +66,79 @@ stdenv.mkDerivation rec { # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... "-DWITH_TEST_FUZZ=OFF" + # Disable FetchContent for flatbuffers and use the version from nixpkgs instead + "-DFLATBUFFERS_USE_FETCHCONTENT=OFF" + "-DPYBIND11_USE_FETCHCONTENT=OFF" ]; doCheck = true; - # Note: disable mullapudi2016_fibonacci because it requires too much - # parallelism for remote builders - preCheck = '' - checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'") + preCheck = + let + disabledTests = lib.strings.concatStringsSep "|" [ + # Requires too much parallelism for remote builders. + "mullapudi2016_fibonacci" + # Take too long---we don't want to run these in CI. + "adams2019_test_apps_autoscheduler" + "anderson2021_test_apps_autoscheduler" + "correctness_cross_compilation" + "correctness_simd_op_check_hvx" + ]; + in + '' + checkFlagsArray+=("ARGS=-E '${disabledTests}'") + ''; + + postInstall = lib.optionalString pythonSupport '' + mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages} + mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages} + rmdir $out/lib/python3/ ''; # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ - llvmPackages.llvm - llvmPackages.lld - llvmPackages.openmp - llvmPackages.libclang - libffi - libpng - libjpeg - eigen - openblas - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - mesa - libGL - ]; + buildInputs = + [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libffi + libpng + libjpeg + eigen + openblas + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + mesa + libGL + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = + [ + cmake + flatbuffers + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.imageio + ]; meta = with lib; { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ck3d atila twesterhout ]; + maintainers = with maintainers; [ + ck3d + atila + twesterhout + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix index 8f628246c6..57031f673d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix @@ -4,5 +4,7 @@ idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; + pack = callPackage ./pack.nix { }; + buildIdris = callPackage ./build-idris.nix { }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/pack.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/pack.nix new file mode 100644 index 0000000000..7e65a3f73a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/pack.nix @@ -0,0 +1,55 @@ +{ + lib, + idris2Packages, + fetchFromGitHub, +}: +let + inherit (idris2Packages) idris2Api buildIdris; + toml = buildIdris { + ipkgName = "toml"; + version = "2022-05-05"; + src = fetchFromGitHub { + owner = "cuddlefishie"; + repo = "toml-idr"; + rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; + hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + }; + idrisLibraries = [ ]; + }; + filepath = buildIdris { + ipkgName = "filepath"; + version = "2023-12-04"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-filepath"; + rev = "eac02d51b631633f32330c788bcebeb24221fa09"; + hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + }; + idrisLibraries = [ ]; + }; + packPkg = buildIdris { + ipkgName = "pack"; + version = "2024-02-07"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-pack"; + rev = "305123401a28a57b02f750c589c35af628b2a5eb"; + hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + }; + idrisLibraries = [ + idris2Api + toml + filepath + ]; + + meta = { + description = "An Idris2 Package Manager with Curated Package Collections"; + mainProgram = "pack"; + homepage = "https://github.com/stefan-hoeck/idris2-pack"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2Packages.idris2.meta) platforms; + }; + }; +in +packPkg.executable diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix index 27c193c056..3da36c083b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: { "/System/Library/CoreServices/SystemVersion.plist" ]; - env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + preBuild = '' + export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache"; + ''; # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # work in Nix's sandbox. Use env from our coreutils instead. @@ -55,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/env" "${coreutils}/bin/env" '' else '' substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ - --replace "/usr/bin/env" "${coreutils}/bin/env" + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + $out/bin/zig test -I $src/test $src/test/behavior.zig runHook postInstallCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/tensorrt/releases.nix b/third_party/nixpkgs/pkgs/development/cuda-modules/tensorrt/releases.nix index 976f8fab11..e8c75b6ccd 100644 --- a/third_party/nixpkgs/pkgs/development/cuda-modules/tensorrt/releases.nix +++ b/third_party/nixpkgs/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -137,7 +137,7 @@ version = "10.3.0.26"; minCudaVersion = "12.0"; maxCudaVersion = "12.5"; - cudnnVersion = "8.9"; + cudnnVersion = "9.3"; filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz"; hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE="; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 15bb0c4217..af90ccd1bb 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -196,6 +196,11 @@ package-maintainers: - hnix - hnix-store-core - hnix-store-remote + artem: + - BNFC-meta + - alex-meta + - happy-meta + - vector-hashtables arturcygan: - hevm athas: diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 885e78c922..8439316bbc 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1369,6 +1369,7 @@ self: { ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.artem ]; }) {}; "BPS" = callPackage @@ -28205,6 +28206,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "alex-prelude" = callPackage @@ -138797,6 +138799,7 @@ self: { libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "happybara" = callPackage @@ -325853,6 +325856,7 @@ self: { ]; description = "Efficient vector-based mutable hashtables implementation"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "vector-heterogenous" = callPackage diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix index 2a5f82d6b8..d1c6e0aff3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.13"; - sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc="; + version = "25.3.2.15"; + sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix index f5fa3522c3..e7c256d1de 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.1"; - sha256 = "sha256-oxOynBFW++igiJtIv1ZjoMgtmumgnsWgwyVx4buhxCo="; + version = "26.2.5.4"; + sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/27.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/27.nix index bf392920d5..91845a1bc2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/27.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0.1"; - sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; + version = "27.1.2"; + sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 38af8a6e09..2b363d4a06 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -98,6 +98,8 @@ stdenv.mkDerivation ({ inherit src version; + LANG = "C.UTF-8"; + nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; buildInputs = [ ncurses opensslPackage ] diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gauche/boot.nix b/third_party/nixpkgs/pkgs/development/interpreters/gauche/boot.nix index 497ebba155..04b69b5240 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gauche/boot.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gauche/boot.nix @@ -10,6 +10,7 @@ zlib, mbedtls, cacert, + darwin, }: stdenv.mkDerivation rec { @@ -28,14 +29,18 @@ stdenv.mkDerivation rec { texinfo ]; - buildInputs = [ - libiconv - gdbm - openssl - zlib - mbedtls - cacert - ]; + buildInputs = + [ + libiconv + gdbm + openssl + zlib + mbedtls + cacert + ] + ++ lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk_11_0.frameworks.CoreServices + ]; postPatch = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 542164aeeb..4e0976c5eb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.2"; + version = "0.22.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-uMVfBptiCungO+XJMlwV2Fhs2jgVNDOqUFqgJPV5RhM="; + hash = "sha256-blreXcpKvatu5Vo5YViIz5Yv2OAsQgs/SGEI2rABDoc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix index c16eebf1e6..cbac6e69e0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "risor"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg="; + hash = "sha256-QtYqepNH+c0WDGKTLtMz/VUz0oDOgCbwe4D9I4wal5s="; }; proxyVendor = true; - vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA="; + vendorHash = "sha256-JrBuHA+u5bI2kcbWaY6/894kh5Xdix0ov6nN5r9rJRE="; subPackages = [ "cmd/risor" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index b703fa52df..ea270b3a70 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -318,4 +318,9 @@ in { cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; + ruby_3_4 = generic { + version = rubyVersion "3" "4" "0" "preview2"; + hash = "sha256-RDzX7FSt5HhryXTOn11J8XKmD47chLWXt/4r0qlLg3E="; + cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg="; + }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tcl/9.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/tcl/9.0.nix new file mode 100644 index 0000000000..48a9570675 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/tcl/9.0.nix @@ -0,0 +1,16 @@ +{ callPackage, fetchzip, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + release = "9.0"; + version = "${release}.0"; + + # Note: when updating, the hash in pkgs/development/libraries/tk/9.0.nix must also be updated! + + src = fetchzip { + url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; + sha256 = "sha256-QaPSY6kfxyc3x+2ptzEmN2puZ0gSFSeeNjPuxsVKXYE="; + }; + } +) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index 5df6fb28a3..7746034c35 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, makeSetupHook, runCommand -, tzdata +, tzdata, zip, zlib # Version specific stuff , release, version, src @@ -24,17 +24,39 @@ let --replace "/usr/local/etc/zoneinfo" "" ''; + nativeBuildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + + buildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + zlib + ]; + preConfigure = '' cd unix ''; - configureFlags = [ + # Note: pre-9.0 flags are temporarily interspersed to avoid a mass rebuild. + configureFlags = lib.optionals (lib.versionOlder version "9.0") [ "--enable-threads" + ] ++ [ # Note: using $out instead of $man to prevent a runtime dependency on $man. "--mandir=${placeholder "out"}/share/man" + ] ++ lib.optionals (lib.versionOlder version "9.0") [ "--enable-man-symlinks" # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" + ] ++ lib.optionals (lib.versionAtLeast version "9.0") [ + # By default, tcl libraries get zipped and embedded into libtcl*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs" + ] ++ [ "tcl_cv_strtod_unbroken=ok" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index 64ff6306d2..f75b5bed48 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix @@ -8,22 +8,22 @@ , CoreFoundation , SystemConfiguration , Security -, withLLVM ? !stdenv.hostPlatform.isDarwin +, withLLVM ? false , withSinglepass ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) }: rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.5"; + version = "4.4.0"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hEhU3o/SLHWV9zmgCtW+7K/2ev+oGAnrZmlyNtoeSV4="; + hash = "sha256-zKo7d7LAfdGb7hC8RK7YH4lhk7RbivS+hNZDyQyHYM8="; }; - cargoHash = "sha256-xyR5pnwMGE5K4o7X0Q2JEervSgR5LK1vqpOa3Mm6xkU="; + cargoHash = "sha256-tajvVMRfBHefU0kVro830HeJSdgJEKPmEQm7X0+4+Kc="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -69,5 +69,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://wasmer.io/"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne shamilton nickcao ]; + # error: multiple fields are never read + # --> lib/compiler-llvm/src/translator/intrinsics.rs:141:9 + broken = withLLVM; }; } diff --git a/third_party/nixpkgs/pkgs/development/java-modules/jna/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/jna/default.nix index ac9590da85..0c990b4c99 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/jna/default.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/jna/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jna"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "java-native-access"; repo = "jna"; rev = finalAttrs.version; - hash = "sha256-a5l9khKLWfvTHv53utfbw344/UNQOnIU93+wZNQ0ji4="; + hash = "sha256-PadOJtoH+guPBQ/j6nIBp7BokNz23OQhaYpcFl/wbpQ="; }; nativeBuildInputs = [ ant jdk stripJavaArchivesHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix index 9c1b8ac81c..8a408864c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "bwidget"; - version = "1.9.16"; + version = "1.10.0"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "sha256-v+ADY3S4QpPSNiCn9t2oZXGBPQx63+2YPB8zflzoGuA="; + sha256 = "sha256-61sCvsua+Iv3SldHhd4eMpzzCjZ5EVMJOnkRT6xRw60="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix index 05ea7db2ca..083e968c11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libxml2, openssl, bzip2}: +{lib, stdenv, fetchurl, libxml2, openssl, bzip2, zlib}: stdenv.mkDerivation rec { pname = "dclib"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; - buildInputs = [libxml2 openssl bzip2]; + buildInputs = [libxml2 openssl bzip2 zlib]; meta = with lib; { description = "Peer-to-Peer file sharing client"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix index b6107f3ef9..2cc3a85adb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -85,5 +85,7 @@ stdenv.mkDerivation (finalAttrs: { }.${precision} ]; platforms = platforms.unix; + # quad-precision requires libquadmath from gfortran, but libquadmath is not supported on aarch64 + badPlatforms = lib.optionals (precision == "quad-precision") platforms.aarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index 180ff45534..0d3a8cc360 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - checkInputs = [ gtest ]; + buildInputs = [ gtest ]; cmakeFlags = [ (lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false) diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix index ed142788c7..e7ad912dc3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix @@ -6,6 +6,10 @@ let }; in { + icu76 = make-icu { + version = "76.1rc"; + hash = "sha256-HMY4hRYbF4Dsf1EGx+m0NRsCUA+Q/JGRpdGIgym/A5I="; + }; icu75 = make-icu { version = "75.1"; hash = "sha256-y5aN8+TS6H6LEcSaXQHHh70TuVRSgPxmQvgmUnYYyu8="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix index 09e7bb3c96..7e137003b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix @@ -8,9 +8,13 @@ let pname = "icu4c"; + #release = lib.replaceStrings [ "." ] [ "-" ] version; + # To test rc versions of ICU replace the line above with the line below. + release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); + baseAttrs = { src = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${release}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; inherit hash; }; @@ -75,7 +79,7 @@ let mkdir -p $static/lib mv -v lib/*.a $static/lib '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${lib.versions.majorMinor version}/pkgdata.inc '' + (let replacements = [ { from = "\${prefix}/include"; to = "${placeholder "dev"}/include"; } # --cppflags-searchpath @@ -83,7 +87,7 @@ let { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile ]; in '' - rm $out/share/icu/${version}/install-sh $out/share/icu/${version}/mkinstalldirs # Avoid having a runtime dependency on bash + rm $out/share/icu/${lib.versions.majorMinor version}/install-sh $out/share/icu/${lib.versions.majorMinor version}/mkinstalldirs # Avoid having a runtime dependency on bash substituteInPlace "$dev/bin/icu-config" \ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements} diff --git a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix index 315a731710..16f9976e2d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.6"; + version = "1.91.4"; outputs = [ # Note: no "dev" because vcpkg installs include/ and imgui-config.cmake # into different prefixes but expects the merged layout at import time @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; - sha256 = "sha256-FSob6FPfg0tF0n72twA5/moLvEaB251BPkIDJUXhYbg="; + rev = "refs/tags/v${version}"; + hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM="; }; cmakeRules = "${vcpkgSource}/ports/imgui"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index a384d49fed..cf429432c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { # stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries. prefix = builtins.placeholder "lib"; + env = lib.optionalAttrs stdenv.hostPlatform.isStatic { + NIX_CFLAGS_COMPILE = "-fcommon"; + }; + configureFlags = [ "--localstatedir=/var/lib" (lib.withFeature withLdap "ldap") diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index e0d130d80f..a92eb38683 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.45"; + version = "1.18.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-2uWZsy8aIV/ToDVuVxpyXoI1GbwZ9IxeLh+1hgjlfEM="; + hash = "sha256-ep9RYHnqmOEqfdFtYzOZnv0aWu4TA8JMyWOj0E2uSYk="; }; nativeBuildInputs = [ cmake addDriverRunpath ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/oneapi-src/level-zero"; changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + platforms = platforms.linux; maintainers = [ maintainers.ziguana ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix index 8b9e889d3e..4130c54eba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Library to read and manipulate EXIF data in digital photographs"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix deleted file mode 100644 index 0b2b4278a6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, autoreconfHook -, makeWrapper -, libxcrypt -, ncurses -, cpio -, gperf -, cdrkit -, flex -, bison -, qemu -, pcre2 -, augeas -, libxml2 -, acl -, libcap -, libcap_ng -, libconfig -, systemd -, fuse -, yajl -, libvirt -, hivex -, db -, gmp -, readline -, file -, numactl -, libapparmor -, jansson -, getopt -, perlPackages -, ocamlPackages -, libtirpc -, appliance ? null -, javaSupport ? false -, jdk -, zstd -}: - -assert appliance == null || lib.isDerivation appliance; - -stdenv.mkDerivation rec { - pname = "libguestfs"; - version = "1.50.1"; - - src = fetchurl { - url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xmhx6I+C5SHjHUQt5qELZJcCN8t5VumdEXsSO1hWWm8="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - bison - cdrkit - cpio - flex - getopt - gperf - makeWrapper - pkg-config - qemu - zstd - ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) - ++ (with ocamlPackages; [ ocaml findlib ]); - buildInputs = [ - libxcrypt - ncurses - jansson - pcre2 - augeas - libxml2 - acl - libcap - libcap_ng - libconfig - systemd - fuse - yajl - libvirt - gmp - readline - file - hivex - db - numactl - libapparmor - perlPackages.ModuleBuild - libtirpc - ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ lib.optional javaSupport jdk; - - prePatch = '' - # build-time scripts - substituteInPlace run.in --replace '#!/bin/bash' '#!${stdenv.shell}' - substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' - - # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml" - substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' - substituteInPlace ocaml/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' - - # some scripts hardcore /usr/bin/env which is not available in the build env - patchShebangs . - ''; - configureFlags = [ - "--disable-appliance" - "--disable-daemon" - "--with-distro=NixOS" - "--with-guestfs-path=${placeholder "out"}/lib/guestfs" - ] ++ lib.optionals (!javaSupport) [ "--without-java" ]; - patches = [ - ./libguestfs-syms.patch - ]; - - createFindlibDestdir = true; - - installFlags = [ "REALLY_INSTALL=yes" ]; - enableParallelBuilding = true; - - postInstall = '' - mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" - for bin in $out/bin/*; do - wrapProgram "$bin" \ - --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ - --prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}" - done - ''; - - postFixup = lib.optionalString (appliance != null) '' - mkdir -p $out/{lib,lib64} - ln -s ${appliance} $out/lib64/guestfs - ln -s ${appliance} $out/lib/guestfs - ''; - - doInstallCheck = appliance != null; - installCheckPhase = '' - runHook preInstallCheck - - export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish - - ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G - - $out/bin/guestfish <<'EOF' - add-drive disk1.img - run - list-filesystems - part-disk /dev/sda mbr - mkfs ext2 /dev/sda1 - list-filesystems - EOF - - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Tools for accessing and modifying virtual machine disk images"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; - # this is to avoid "output size exceeded" - hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix index 79a419451d..fac097e0d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.2.1"; + version = "0.2.2"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ="; + sha256 = "sha256-Vn5Qjyo2FHCmQC2pmb1qgU81VaFKsXnSIwlSYk/8Rig="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjodycode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjodycode/default.nix index 28a564c9bc..acac78266f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjodycode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjodycode/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/jbruchon/libjodycode"; changelog = "https://codeberg.org/jbruchon/libjodycode/src/branch/master/CHANGES.txt"; license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pbsds ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodbus/default.nix index e76b528395..e27e8e1c38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodbus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.10"; + version = "3.1.11"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${version}"; - hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k="; + hash = "sha256-d/diR9yeV0WY0C6wqxYZfOjEKFeWTvN73MxcWtXPOJc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix index b5c06c609f..832146707d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix @@ -1,64 +1,79 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gi-docgen -, glib -, gtk3 -, gtk4 -, libsForQt5 -, variant ? null +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + vala, + gi-docgen, + glib, + gtk3, + gtk4, + libsForQt5, + qt6Packages, + variant ? null, }: -assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5"; +assert + variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5" || variant == "qt6"; stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.7.1"; + version = "0.8.1"; - outputs = [ "out" "dev" ] - ++ lib.optional (variant != "qt5") "devdoc"; + outputs = [ + "out" + "dev" + ] ++ lib.optional (variant != "qt5") "devdoc"; src = fetchFromGitHub { owner = "flatpak"; repo = "libportal"; rev = version; - sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho="; + sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc="; }; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ - meson - ninja - pkg-config - gi-docgen - ] ++ lib.optionals (variant != "qt5") [ - gobject-introspection - vala - ]; + nativeBuildInputs = + [ + meson + ninja + pkg-config + gi-docgen + ] + ++ lib.optionals (variant != "qt5") [ + gobject-introspection + vala + ]; - propagatedBuildInputs = [ - glib - ] ++ lib.optionals (variant == "gtk3") [ - gtk3 - ] ++ lib.optionals (variant == "gtk4") [ - gtk4 - ] ++ lib.optionals (variant == "qt5") [ - libsForQt5.qtbase - libsForQt5.qtx11extras - ]; + propagatedBuildInputs = + [ + glib + ] + ++ lib.optionals (variant == "gtk3") [ + gtk3 + ] + ++ lib.optionals (variant == "gtk4") [ + gtk4 + ] + ++ lib.optionals (variant == "qt5") [ + libsForQt5.qtbase + libsForQt5.qtx11extras + ] + ++ lib.optionals (variant == "qt6") [ + qt6Packages.qtbase + ]; mesonFlags = [ (lib.mesonEnable "backend-gtk3" (variant == "gtk3")) (lib.mesonEnable "backend-gtk4" (variant == "gtk4")) (lib.mesonEnable "backend-qt5" (variant == "qt5")) + (lib.mesonEnable "backend-qt6" (variant == "qt6")) (lib.mesonBool "vapi" (variant != "qt5")) (lib.mesonBool "introspection" (variant != "qt5")) (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true @@ -72,11 +87,11 @@ stdenv.mkDerivation rec { # we don't have any binaries dontWrapQtApps = true; - meta = with lib; { + meta = { description = "Flatpak portal library"; homepage = "https://github.com/flatpak/libportal"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch index 94b4c61bef..825c9e0c38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index b5877ed..455167c 100644 QString provider = providerString; - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); -+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml")); if (provider.contains("\'")) { provider = provider.replace("\'", "'"); @@ -25,7 +25,7 @@ index b5877ed..455167c 100644 #ifdef QOFONO_PROVISIONING QXmlQuery query; - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); -+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml")); QString providerStr = provider; if (providerStr.contains("\'")) { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix index a7d7868f30..f337de228a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { patches = [ (substituteAll { src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; - inherit mobile-broadband-provider-info; + mobileBroadbandProviderInfo = mobile-broadband-provider-info; }) ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix index f6cf4a6e62..0924285cae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -151,4 +151,9 @@ in { }) ]; }; + + libressl_4_0 = generic { + version = "4.0.0"; + hash = "sha256-TYQZVfCsw9/HHQ49018oOvRhIiNQ4mhD/qlzHAJGoeQ="; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix index 8eeec2dbfe..8330b34f4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA="; }; + patches = [ + # Drop use of deprecated libxml2 HTTP API. + # From: https://www.gaia-gis.it/fossil/libspatialite/info/7c452740fe + # see also: https://github.com/NixOS/nixpkgs/issues/347085 + ./xmlNanoHTTPCleanup.patch + ]; + nativeBuildInputs = [ pkg-config validatePkgConfig @@ -35,7 +42,7 @@ stdenv.mkDerivation rec { freexl geos librttopo - (libxml2.override { enableHttp = true; }) + libxml2 minizip proj sqlite diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch new file mode 100644 index 0000000000..75ec36a0fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch @@ -0,0 +1,26 @@ +diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c +index fe07a0d..7f2557d 100644 +--- a/src/wfs/wfs_in.c ++++ b/src/wfs/wfs_in.c +@@ -76,7 +76,10 @@ Regione Toscana - Settore Sistema Informativo Territoriale ed Ambientale + #ifdef ENABLE_LIBXML2 /* LIBXML2 enabled: supporting XML documents */ + + #include +-#include ++ ++#ifdef LIBXML_HTTP_ENABLED ++ #include ++#endif + + #define MAX_GTYPES 28 + +@@ -4637,7 +4640,9 @@ SPATIALITE_DECLARE void + reset_wfs_http_connection (void) + { + /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ ++#ifdef LIBXML_HTTP_ENABLED + xmlNanoHTTPCleanup (); ++#endif + } + + #else /* LIBXML2 isn't enabled */ \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix index 8c93e414ed..bd6a7b1a49 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.5.0"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E="; + sha256 = "sha256-wJAkIUGK7Ud6n2p1275vNkSx/W7LlgKWXQaDevetPko="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix index 453722ccf4..759edc288e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, fetchpatch2 , fetchurl , perl , zlib @@ -18,22 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M="; + hash = "sha256-wOb6UqYroR79MCYikNxpcJR67zLgzClO5Q6QBc6sCSo="; }; - patches = [ - # https://github.com/nih-at/libzip/issues/404 - (fetchpatch2 { - name = "Check-for-zstd_TARGET-before-using-it-in-a-regex.patch"; - url = "https://github.com/nih-at/libzip/commit/c719428916b4d19e838f873b1a177b126a080d61.patch"; - hash = "sha256-4ksbXEM8kNvs3wtbIaXLEQNSKaxl0es/sIg0EINaTHE="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ cmake perl groff ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/3.nix b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/3.nix index f8f53522db..9655393615 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.6.1"; - hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; + version = "3.6.2"; + hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix index 3c781689bb..820afcbd8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; }; + patches = [ + # Compatibility with YODA 2.x + ./yoda2_support.patch + ]; + buildInputs = [ boost gfortran diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch new file mode 100644 index 0000000000..d9f4aaa515 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch @@ -0,0 +1,247 @@ +diff --git a/src/fnlo-tk-statunc.cc b/src/fnlo-tk-statunc.cc +index 62d1eec..ad62cac 100644 +--- a/src/fnlo-tk-statunc.cc ++++ b/src/fnlo-tk-statunc.cc +@@ -30,7 +30,16 @@ + #include "fastnlotk/fastNLOLHAPDF.h" + #include "fastnlotk/speaker.h" + #ifdef WITH_YODA ++#if defined __has_include ++#if !__has_include("YODA/WriterAIDA.h") ++#define WITH_YODA2 ++#endif ++#endif ++#ifdef WITH_YODA2 ++#include "YODA/Scatter.h" ++#else + #include "YODA/Scatter2D.h" ++#endif + #include "YODA/WriterYODA.h" + #endif + +@@ -493,28 +502,25 @@ int main(int argc, char** argv) { + + //! --- 1D + if (NDim == 1) { +- //! Vectors to fill 2D scatter plot +- vector < double > x; +- vector < double > y; +- vector < double > exminus; +- vector < double > explus; +- vector < double > eyminus; +- vector < double > eyplus; ++ //! Vector to fill 2D scatter plot ++ vector points; + //! Loop over bins in outer (1st) dimension + for (unsigned int k =0 ; k x; +- vector < double > y; +- vector < double > exminus; +- vector < double > explus; +- vector < double > eyminus; +- vector < double > eyplus; ++ //! Vector to fill 2D scatter plot ++ vector points; + //! Loop over bins in inner (2nd) dimension + NDimBins[1] = fnlo.GetNDim1Bins(j); + for (unsigned int k = 0; k x; +- vector < double > y; +- vector < double > exminus; +- vector < double > explus; +- vector < double > eyminus; +- vector < double > eyplus; ++ //! Vector to fill 2D scatter plot ++ vector < YODA::Point2D > points; + //! Loop over bins in outer (1st) dimension + for (unsigned int k =0 ; k x; +- vector < double > y; +- vector < double > exminus; +- vector < double > explus; +- vector < double > eyminus; +- vector < double > eyplus; ++ vector < YODA::Point2D > points; + //! Loop over bins in inner (2nd) dimension + NDimBins[1] = fnlo->GetNDim1Bins(j); + for (unsigned int k = 0; kGetNDim1Bins(j); + for (unsigned int k = 0; k x; +- vector < double > y; +- vector < double > exminus; +- vector < double > explus; +- vector < double > eyminus; +- vector < double > eyplus; ++ vector < YODA::Point2D > points; + //! Loop over bins in inner (3rd) dimension + NDimBins[2] = fnlo->GetNDim2Bins(j,k); + for (unsigned int l = 0; l 14 update "test_dump" "test_input_formats" "test_other_input_formats" @@ -146,10 +141,10 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md"; description = "Adobe Font Development Kit for OpenType"; + changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md"; homepage = "https://adobe-type-tools.github.io/afdko"; license = licenses.asl20; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index 306dd1aff4..21d831c9e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-dcYp5lMN5twK1HQK/3PhBQ4nm/NKURC0x14ozkbzJ5A="; + hash = "sha256-LFMHueSz0ddZNYUL0uuC91dw1ppYcdE/EjKX0ikc+J0="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index ca0204fe12..eb6524e1d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.3"; + version = "3.2.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-gWuFCL78hcOflXlDwYDSu3+G/F8D5najtoTgKKzod1Y="; + hash = "sha256-9TvpdsWmNXz7UAh0BCgjdRWLKCP2FdE8TIjvyDXydLU="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix index a010d3570b..cfd76b23a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix @@ -3,38 +3,36 @@ buildPythonPackage, fetchFromGitHub, amaranth, - setuptools, - setuptools-scm, + pdm-backend, unstableGitUpdater, }: buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2024-05-01"; + version = "0-unstable-2024-10-18"; pyproject = true; - # python setup.py --version - realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; + # from `pdm show` + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; + rev = "23c66d68045831de0a372c8c237274d74c71ef4e"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8="; + hash = "sha256-cC7uvj9+6h3RPbFdu3/T1t/jhw5CuLOF8aKwDSkRE54="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - dependencies = [ - setuptools - amaranth - ]; + build-system = [ pdm-backend ]; + dependencies = [ amaranth ]; preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${realVersion}" ''; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix index 597a182916..a33128a376 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,22 +9,24 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-06-10"; + version = "0.1a-unstable-2024-10-12"; pyproject = true; # from `pdm show` - realVersion = let - tag = builtins.elemAt (lib.splitString "-" version) 0; - rev = lib.substring 0 7 src.rev; - in "${tag}1.dev1+g${rev}"; + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "e1b842800533f44924f21c3867bc2290084d100f"; - hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y="; + rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc"; + hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8="; }; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; dependencies = [ amaranth ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix index bac25d70f0..e79be265ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix @@ -21,20 +21,18 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo="; + hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg="; }; - nativeBuildInputs = [ - git - pdm-backend - ]; + nativeBuildInputs = [ git ]; + build-system = [ pdm-backend ]; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/axisregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/axisregistry/default.nix index f4760c6200..e0379c127e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/axisregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/axisregistry/default.nix @@ -5,8 +5,8 @@ fonttools, protobuf, pytestCheckHook, - setuptools-scm, pythonOlder, + setuptools-scm, }: buildPythonPackage rec { @@ -27,6 +27,8 @@ buildPythonPackage rec { # in the closure of fontbakery. It seems to be compatible enough. pythonRelaxDeps = [ "protobuf" ]; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + build-system = [ setuptools-scm ]; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix index 43cb84bac0..8fbdd5541f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix @@ -1,21 +1,23 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, pytestCheckHook, + libiconv, }: buildPythonPackage rec { pname = "biliass"; - version = "2.0.0-beta.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "yutto-dev"; repo = "yutto"; rev = "refs/tags/biliass@${version}"; - hash = "sha256-Clma0Ggkphk6F+K+h3TdMUX4WyWQorh9g2uAT4+Fc9I="; + hash = "sha256-PlZD+988KdJqYC1I1K7i+YAH1Tzr6zfXcJFR/M4mQRA="; }; sourceRoot = "source/packages/biliass"; @@ -28,7 +30,7 @@ buildPythonPackage rec { src ; sourceRoot = "${sourceRoot}/${cargoRoot}"; - hash = "sha256-h/UOolWQ2k5krOZy/kPywpeiLyXWLzvNu+pcn97or1A="; + hash = "sha256-DMKUbJSVME5siSPybdO5bOluPn3obVq1/6822uoSsDQ="; }; nativeBuildInputs = with rustPlatform; [ @@ -36,6 +38,10 @@ buildPythonPackage rec { maturinBuildHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + doCheck = false; # test artifacts missing nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix index c720218717..0c8a0ba0e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix @@ -1,47 +1,51 @@ { lib, buildPythonPackage, - fetchPypi, cffi, - enum34, construct, - pytest, + fetchPypi, hypothesis, + pytest, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "brotlipy"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"; + hash = "sha256-Nt7wuFm+ryGRAVe0wz6zsG2M5FnJQhAvFpiMym6hZN8="; }; - propagatedBuildInputs = [ - cffi - enum34 - construct - ]; + build-system = [ setuptools ]; propagatedNativeBuildInputs = [ cffi ]; - nativeCheckInputs = [ - pytest - hypothesis + dependencies = [ + cffi + construct ]; - checkPhase = '' - py.test - ''; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; # Missing test files doCheck = false; + pythonImportsCheck = [ "brotli" ]; + meta = { description = "Python bindings for the reference Brotli encoder/decoder"; homepage = "https://github.com/python-hyper/brotlipy/"; license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix index 93a0def997..313b367811 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix @@ -4,6 +4,7 @@ pythonOlder, fetchFromGitHub, setuptools, + click, watchdog, portalocker, pytestCheckHook, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "python-cachier"; repo = "cachier"; rev = "refs/tags/v${version}"; - hash = "sha256-VApP1DRs+mjx+SELpdDOm2Sa7zBYHDqD/htFF/eNLu0="; + hash = "sha256-LphmYL8Jmry8Jmd5Eps68wD113JMWwyBl18pqdtl+DQ="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -38,6 +39,8 @@ buildPythonPackage rec { dependencies = [ watchdog portalocker + # not listed as dep, but needed to run main script entrypoint + click ]; nativeCheckInputs = [ @@ -63,6 +66,10 @@ buildPythonPackage rec { # don't test formatting "test_flake8" + + # timing sensitive + "test_being_calc_next_time" + "test_pickle_being_calculated" ]; preBuild = '' @@ -73,6 +80,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-cachier/cachier"; + changelog = "https://github.com/python-cachier/cachier/releases/tag/v${version}"; description = "Persistent, stale-free, local and cross-machine caching for functions"; mainProgram = "cachier"; maintainers = with lib.maintainers; [ pbsds ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index e79aab479c..9751552d04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.8.7"; + version = "10.9.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-En4zOSIOK+1JGmG6UhGieb4lM/q6akl7xF0s/64ocPg="; + hash = "sha256-XJqbZicRQCiykdXn2R8tOzWPbtrso9IwZYpcTcY7vio="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix index 51b5b40a14..cf1a33cf31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "click-aliases"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = "click-aliases"; rev = "v${version}"; - hash = "sha256-3/O5odibSjo5inlLCvUlotphhMVLBdaND/M2f40pMyM="; + hash = "sha256-vR5MUbgQfgownnq/VuEB/Jreibh/SB8wbDWGOmareRU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix index 0ecca4ea0f..7231d0e44e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix @@ -1,57 +1,39 @@ { lib, buildPythonPackage, - fetchFromGitHub, - isPy27, - pythonAtLeast, - poetry-core, - - # propagates - pylev, - pastel, - - # python36+ crashtest, - - # python2 - typing, - enum34, - - # tests + fetchFromGitHub, + pastel, + poetry-core, + pylev, pytest-mock, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "clikit"; version = "0.6.2"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sdispater"; - repo = pname; + repo = "clikit"; rev = "refs/tags/${version}"; hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - 'crashtest = { version = "^0.3.0", python = "^3.6" }' \ - 'crashtest = { version = "*", python = "^3.6" }' - ''; + pythonRelaxDeps = [ "crashtest" ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = - [ - pylev - pastel - ] - ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] - ++ lib.optionals isPy27 [ - typing - enum34 - ]; + dependencies = [ + crashtest + pastel + pylev + ]; nativeCheckInputs = [ pytest-mock @@ -61,8 +43,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "clikit" ]; meta = with lib; { - homepage = "https://github.com/sdispater/clikit"; description = "Group of utilities to build beautiful and testable command line interfaces"; + homepage = "https://github.com/sdispater/clikit"; + changelog = "https://github.com/sdispater/clikit/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 90b3423ac3..9c28b1abc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -7,7 +7,6 @@ poetry-core, # dependencies - boto3, fastavro, httpx, httpx-sse, @@ -15,7 +14,6 @@ pydantic, pydantic-core, requests, - sagemaker, tokenizers, types-requests, typing-extensions, @@ -23,20 +21,19 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.11.0"; + version = "5.11.1"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-KhONCdIGKYbIcFG+zv6uXSiX+crsmgPZUU+5NsSWaA8="; + hash = "sha256-3fYc0jOfmQ8wnKb5JZY+fXoN+8dXhJi5bj2TJHJaOEo="; }; build-system = [ poetry-core ]; dependencies = [ - boto3 fastavro httpx httpx-sse @@ -44,7 +41,6 @@ buildPythonPackage rec { pydantic pydantic-core requests - sagemaker tokenizers types-requests typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crcelk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crcelk/default.nix new file mode 100644 index 0000000000..f082899cfe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crcelk/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "crcelk"; + version = "1.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "zeroSteiner"; + repo = "crcelk"; + rev = "refs/tags/v${version}"; + hash = "sha256-eJt0qcG0ejTQJyjOSi6Au2jH801KOMnk7f6cLbd7ADw="; + }; + + build-system = [ setuptools ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "crcelk" ]; + + meta = { + description = "Implementation of the CRC algorithm"; + homepage = "https://github.com/zeroSteiner/crcelk"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix index c038eb4666..11492f912a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix @@ -7,14 +7,15 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, libiconv, }: buildPythonPackage rec { pname = "cryptg"; - version = "0.4"; - format = "setuptools"; + version = "0.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,16 +23,20 @@ buildPythonPackage rec { owner = "cher-nov"; repo = pname; rev = "v${version}"; - hash = "sha256-2HP1mKGPr8wOL5B0APJks3EVBicX2iMFI7vLJGTa1PM="; + hash = "sha256-uJfMetplTyRT95P/8ljz4H4ASYMXEM7jROWSpjftKjU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-AqSVFOB9Lfvk9h3GtoYlEOXBEt7YZYLhCDNKM9upQ2U="; + hash = "sha256-HDMztt7/ZpPlpy0IMGuWGGo4vwKhraFTmTTPr9tC+Ok="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-rust + ]; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustc cargo @@ -44,6 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "cryptg" ]; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail "setuptools[core]" "setuptools" + ''; + meta = with lib; { description = "Official Telethon extension to provide much faster cryptography for Telegram API requests"; homepage = "https://github.com/cher-nov/cryptg"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cymruwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cymruwhois/default.nix new file mode 100644 index 0000000000..8e399069f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cymruwhois/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + python-memcached, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "cymruwhois"; + version = "1.6"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "JustinAzoff"; + repo = "python-cymruwhois"; + rev = "refs/tags/${version}"; + hash = "sha256-d9m668JYI9mxUycoVWyaDCR7SOca+ebymZxWtgSPWNU="; + }; + + build-system = [ setuptools ]; + + optional-dependencies = { + CACHE = [ python-memcached ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cymruwhois" ]; + + disabledTests = [ + # Tests require network access + "test_asn" + # AssertionError + "test_doctest" + ]; + + meta = { + description = "Python client for the whois.cymru.com service"; + homepage = "https://github.com/JustinAzoff/python-cymruwhois"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix index 50a775edfa..ce94c14f45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ hatchling ]; + pythonRelaxDeps = [ "protobuf" ]; + dependencies = [ agate dbt-common diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix index 0bb43248db..b97f071343 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix @@ -36,7 +36,10 @@ buildPythonPackage rec { build-system = [ hatchling ]; - pythonRelaxDeps = [ "agate" ]; + pythonRelaxDeps = [ + "protobuf" + "agate" + ]; dependencies = [ agate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index 4388c972c4..79a5350754 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/core"; pythonRelaxDeps = [ + "protobuf" "agate" "click" "dbt-semantic-interfaces" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 9eb306074a..94d21ce3ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.6.2"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-V6yMT9Fkug+T3smBEu0Szg5GPMRxEOZc4gtJybWXbrs="; + hash = "sha256-LHcNitkrDQNz2971iMn13eELUyuJbjUK/u+u83JRIBk="; }; pythonRelaxDeps = [ "importlib-metadata" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix index e5297364fc..1b4837de4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix @@ -27,19 +27,22 @@ buildPythonPackage rec { pname = "diffenator2"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "diffenator2"; rev = "refs/tags/v${version}"; - hash = "sha256-zeNcNR14ieY6Inp4kOwIPXd6S+/wFdMFp6wbiqgB/iA="; + hash = "sha256-FVdQW2iupAxHFmx6sC88yO2Vx3VvBhPJl55gA0fmvgo="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; - pythonRelaxDeps = [ "protobuf" ]; + pythonRelaxDeps = [ + "protobuf" + "python-bidi" + ]; build-system = [ poetry-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix index 3e344f8813..49a6e3cb6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix @@ -7,7 +7,6 @@ django, packaging, nodejs, - js2py, six, }: @@ -25,9 +24,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ] ++ lib.optionals (pythonAtLeast "3.7") [ packaging ]; + # Js2py is needed for tests but it's unmaintained and insecure + doCheck = false; + nativeCheckInputs = [ nodejs - js2py six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-modeltranslation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-modeltranslation/default.nix index 3b7cd55b49..1fb63c59cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.9"; + version = "0.19.10"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A="; + hash = "sha256-E3CaQx5SGOnxqjLFY0opcKZF4DMl2HKSUD0gOnA25RA="; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix index 1a35580d19..91c78393be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -29,13 +29,14 @@ buildPythonPackage rec { hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; }; - nativeBuildInputs = [ - setuptools-scm + build-system = [ setuptools-scm ]; + + pythonRelaxDeps = [ + "django-phonenumber-field" + "qrcode" ]; - pythonRelaxDeps = [ "django-phonenumber-field" ]; - - propagatedBuildInputs = [ + dependencies = [ django django-formtools django-otp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-csv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-csv/default.nix new file mode 100644 index 0000000000..a7aa1abbd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-csv/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + djangorestframework, + pytestCheckHook, + pytest-django, + python, +}: + +buildPythonPackage rec { + pname = "djangorestframework-csv"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mjumbewu"; + repo = "django-rest-framework-csv"; + rev = "refs/tags/${version}"; + hash = "sha256-XtMkSucB7+foRpTaRfGF1Co0n3ONNGyzex6MXR4xM5c="; + }; + + dependencies = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} manage.py test + runHook postCheck + ''; + + pythonImportsCheck = [ "rest_framework_csv" ]; + + meta = { + description = "CSV Tools for Django REST Framework"; + homepage = "https://github.com/mjumbewu/django-rest-framework-csv"; + changelog = "https://github.com/mjumbewu/django-rest-framework-csv/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix index f66fe4bf48..5faf143daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, dlib, python, - pytest, + pytestCheckHook, more-itertools, sse4Support ? stdenv.hostPlatform.sse4_1Support, avxSupport ? stdenv.hostPlatform.avxSupport, @@ -24,7 +24,7 @@ buildPythonPackage { patches = [ ./build-cores.patch ]; nativeCheckInputs = [ - pytest + pytestCheckHook more-itertools ]; @@ -34,13 +34,6 @@ buildPythonPackage { --replace "pytest==3.8" "pytest" ''; - # although AVX can be enabled, we never test with it. Some Hydra machines - # fail because of this, however their build results are probably used on hardware - # with AVX support. - checkPhase = '' - ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS - ''; - setupPyBuildFlags = [ "--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" "--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dncil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dncil/default.nix new file mode 100644 index 0000000000..d57e491a78 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dncil/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "dncil"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mandiant"; + repo = "dncil"; + rev = "refs/tags/v${version}"; + hash = "sha256-bndkiXkIYTd071J+mgkmJmA+9J5yJ+9/oDfAypN7wYo="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "dncil" ]; + + meta = { + description = "Module to disassemble Common Intermediate Language (CIL) instructions"; + homepage = "https://github.com/mandiant/dncil"; + changelog = "https://github.com/mandiant/dncil/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix index 072192a23b..9ae5f9c4b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix @@ -1,69 +1,76 @@ { lib, buildPythonPackage, - fetchFromGitHub, decorator, - packaging, - pynput, - regex, - lark, - enum34, - pyperclip, - six, - requests, - psutil, + fetchFromGitHub, json-rpc, - werkzeug, kaldi-active-grammar, + lark, + packaging, + psutil, + pynput, + pyperclip, + pythonOlder, + regex, + requests, + setuptools, + six, sounddevice, webrtcvad, - setuptools, - xdotool, + werkzeug, wmctrl, + xdotool, xorg, }: buildPythonPackage rec { pname = "dragonfly"; version = "0.35.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dictation-toolbox"; - repo = pname; - rev = version; + repo = "dragonfly"; + rev = "refs/tags/${version}"; hash = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM="; }; postPatch = '' - substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark' substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ - --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' + --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ - --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ - --replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ - --replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' + --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ + --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ + --replace-fail 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' ''; + pythonRemoveDeps = [ "lark-parser" ]; + propagatedBuildInputs = [ decorator - packaging - pynput - regex - lark - enum34 - pyperclip - six - requests - psutil json-rpc - werkzeug - kaldi-active-grammar # for the Kaldi engine - sounddevice - webrtcvad + lark + packaging + psutil + pynput + pyperclip + regex + requests setuptools # needs pkg_resources at runtime + six + werkzeug ]; + optional-dependencies = { + kaldi = [ + kaldi-active-grammar + sounddevice + webrtcvad + ]; + }; + # Too many tests fail because of the unusual environment or # because of the missing dependencies for some of the engines. doCheck = false; @@ -73,6 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Speech recognition framework allowing powerful Python-based scripting"; homepage = "https://github.com/dictation-toolbox/dragonfly"; + changelog = "https://github.com/dictation-toolbox/dragonfly/blob/${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index 5870655c5b..98046f8b51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.7"; + version = "1.21.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TDuTBos9/KaWmrERFV5N1vey1oC5h3jej9Rgt4N72w0="; + hash = "sha256-y7f4HD0UDyIHOStLxd3mU4TutY4bfuoabWQd7C9zUqk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index a5c30114c4..67a309fcee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.12"; + version = "0.22.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-PIQ/OrZnm+WOlvTzCHb64/bj7/JGKBEbh6lHD0Pm0ro="; + hash = "sha256-rauk8rY3i5fWUrE8lszyC9KBVjTZ7zhXO98cMhIiiz8="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eq3btsmart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eq3btsmart/default.nix index 5fc267fe2e..908dc2ac97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eq3btsmart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eq3btsmart/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eq3btsmart"; - version = "1.1.9"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "EuleMitKeule"; repo = "eq3btsmart"; rev = "refs/tags/${version}"; - hash = "sha256-7kJqPygX2Oc7fz31qZWrS1ZA+kANZr8vxOwarUzgp/M="; + hash = "sha256-Z3GfUTh3qp5ICJAYsCO6ufw/Jd5FDjOaQE9SaD3H0IU="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix index 80f1b114f4..b1cdd8d36f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.7"; + version = "0.11.8"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-0waIpsVWoABtf4M0IOie9nJDk+e75ArTVmGqYg9AlnI="; + hash = "sha256-lZb2NobSELz8kviPd4Z8PPEEaydaEC5Z6eb9pzC7Ki8="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index 3bce1d20ee..cc13fa17e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.11"; + version = "1.7.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-dRAkhTIH2t6W1Ygda4BRHojKYgwTXaHu4KkKqQIzulw="; + hash = "sha256-CJG/cKgqdUrJcYV5pgGjrnoXzRAj3xya7LwvchNGrPU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix index 8dff7f5a39..ec14d3b0df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.3"; + version = "unstable-2024-07-26"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; - rev = "refs/tags/v${version}"; + # rev = "refs/tags/v${version}"; + rev = "d57c5b40b06e59ec44240d93485a95799548af50"; hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; }; @@ -33,7 +34,10 @@ buildPythonPackage rec { setuptools ]; - pythonRelaxDeps = [ "tokenizers" ]; + pythonRelaxDeps = [ + "tokenizers" + "av" + ]; dependencies = [ av diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-mail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-mail/default.nix index 104d6f3da2..0f1e4e227e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-mail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-mail/default.nix @@ -31,6 +31,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # Broken by fix for CVE-2023-27043. + # Reported upstream in https://github.com/pallets-eco/flask-mail/issues/233 + "test_unicode_sender_tuple" + "test_unicode_sender" + ]; + meta = { description = "Flask extension providing simple email sending capabilities"; homepage = "https://github.com/pallets-eco/flask-mail"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix index 7857ff5627..d35a991943 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cookiecutter" "packaging" + "qrcode" "watchdog" "websockets" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix index c875392e62..489a86fd00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = [ "collidoscope" "protobuf" @@ -127,7 +129,7 @@ buildPythonPackage rec { ''; disabledTests = [ - # These require network access: + # These require network access "test_check_description_broken_links" "test_check_description_family_update" "test_check_metadata_designer_profiles" @@ -138,6 +140,8 @@ buildPythonPackage rec { "test_check_cjk_vertical_metrics" "test_check_cjk_vertical_metrics_regressions" "test_check_fontbakery_version_live_apis" + # AssertionError + "test_check_shape_languages" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index eaf5e2fd7b..092cf21301 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.5"; + version = "2.4.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-/lsf5lF+3uzE6KvP1GJQ5gymyKAVX4CflgLXnB7qeeY="; + hash = "sha256-cdKI0wIr0w6seV12cigqyJL6PSkLVzwVxASUB8n7lFY="; }; # build C version if it exists diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix index 841be6b868..07b255e804 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.1.6"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-dVpPq2TJsR+0VWfup2SNLsnBP2j/HUQsoxJebNkD8Sw="; + hash = "sha256-424PRKjQnpb6fH+iSAqkoOhlvugW7W3wjUxCHTc/A20="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix index 058f241d37..95084d373e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix @@ -5,6 +5,7 @@ protobuf, pytestCheckHook, pythonOlder, + regex, setuptools, setuptools-scm, uharfbuzz, @@ -13,29 +14,33 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.6.2"; + version = "0.6.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v93mXDwHT/8Tau78ApLUR+dQCpL9jmRQp0BT5y/sfq4="; + hash = "sha256-wMhRVWdjKiEfzswnAWqKfzHrpJj0U4q8tzDBGshNryo="; }; - pyproject = true; - # Relax the dependency on protobuf 3. Other packages in the Google Fonts # ecosystem have begun upgrading from protobuf 3 to protobuf 4, # so we need to use protobuf 4 here as well to avoid a conflict # in the closure of fontbakery. It seems to be compatible enough. pythonRelaxDeps = [ "protobuf" ]; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + build-system = [ setuptools setuptools-scm ]; - dependencies = [ protobuf ]; + dependencies = [ + protobuf + regex + ]; nativeCheckInputs = [ pytestCheckHook @@ -43,6 +48,14 @@ buildPythonPackage rec { youseedee ]; + pythonImportsCheck = [ "gflanguages" ]; + + disabledTests = [ + # AssertionError + "test_exemplars_are_in_script" + "test_sample_texts_are_in_script" + ]; + meta = with lib; { description = "Python library for Google Fonts language metadata"; homepage = "https://github.com/googlefonts/lang"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix index b75172ad53..dbed4711f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix @@ -114,6 +114,8 @@ buildPythonPackage rec { --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools" ''; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = [ "protobuf" "pygit2" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix index a64a1683d3..4259da5796 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix @@ -2,31 +2,39 @@ lib, buildPythonPackage, fetchPypi, - six, - enum34, + pythonOlder, + setuptools, + tensorflow, + torch, }: buildPythonPackage rec { pname = "gin-config"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0c6ea5026ded927c8c93c990b01c695257c1df446e45e549a158cfbc79e19ed6"; + hash = "sha256-DG6lAm3tknyMk8mQsBxpUlfB30RuReVJoVjPvHnhntY="; }; - propagatedBuildInputs = [ - six - enum34 - ]; + build-system = [ setuptools ]; + + optional-dependencies = { + tensorflow = [ tensorflow ]; + torch = [ torch ]; + }; # PyPI archive does not ship with tests doCheck = false; + pythonImportsCheck = [ "gin" ]; + meta = with lib; { - homepage = "https://github.com/google/gin-config"; description = "Gin provides a lightweight configuration framework for Python, based on dependency injection"; + homepage = "https://github.com/google/gin-config"; license = licenses.asl20; maintainers = with maintainers; [ jethro ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix index e918de58ae..e95a1a3ecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix @@ -1,16 +1,17 @@ { lib, buildPythonPackage, - fetchPypi, defcon, + fetchPypi, fonttools, gflanguages, glyphslib, pytestCheckHook, + pythonOlder, pyyaml, requests, - setuptools, setuptools-scm, + setuptools, unicodedata2, }: @@ -19,11 +20,15 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + postPatch = '' substituteInPlace setup.py \ --replace-fail "setuptools_scm>=8.0.4,<8.1" "setuptools_scm" @@ -53,13 +58,16 @@ buildPythonPackage rec { disabledTests = [ # This "test" just tries to connect to PyPI and look for newer releases. Not needed. "test_dependencies" + # AssertionError + "test_definitions" ]; meta = with lib; { description = "Google Fonts glyph set metadata"; - mainProgram = "glyphsets"; homepage = "https://github.com/googlefonts/glyphsets"; + changelog = "https://github.com/googlefonts/glyphsets/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; + mainProgram = "glyphsets"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index e830e78dd0..384dcd6d0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.7"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-GLarRvI2eud/iNwj7ujZwIpK/b0ClhO0XUdBi4J9Lp0="; + hash = "sha256-EyYdNDLDmIPyBZ9zYLASahS0gUrJ9SXhdjokKKWZ4lU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 22389251e0..7e71adc679 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_storage"; inherit version; - hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o="; + hash = "sha256-Ui+rqaaL6n6YVwccM/r85e5SC3sXXaAEiQFyQq3o7Cc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 386b240f6b..25b517fef0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.51.0"; + version = "2.52.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw="; + hash = "sha256-ei+sdoCmpbsndrSUof0eLmTkk1ZDsqAfuTu40btzsO8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 56e898a15b..503cb06d33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.11.0"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-+oeVT/ag00BEObbqzkC/EazEwnrWvRURnz3gnCBbn4k="; + pname = "google_cloud_error_reporting"; + inherit version; + hash = "sha256-1ir8o3jwzmfi7E8QPTn3E6RGtTOL9KM05NRaMRYzh5A="; }; build-system = [ setuptools ]; @@ -38,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 5387654ffc..8164ebb271 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-hRzD46MqUA/edzeEBh6c6l6ZYKxXaIOid19w1hNZhQo="; + hash = "sha256-jR91d6b4btSDNeEIFGgCYeKXbaVIiMih1YYETuGRlvQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index 699430682d..0c2664caa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "5.0.1"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4="; + hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix index e2e6976b60..3c9a3684c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-sxxw/XAPENtNeY/64+pxnPgMBBM7+lpF52ixRm18d48="; + hash = "sha256-qBT0Xub+eL7rfF+lQWlheBJSahEKWjREGJQD6sHjTPk="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 208f6a7c82..aed63cf3ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.4.1"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-DgfoaRvgU4WWbCirbLld8f/C2bPrW576aX0HglaRjEU="; + hash = "sha256-DeXmKswapXPYGTiJLq2yvCwJywCNl79XYHSau0VCCIY="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix new file mode 100644 index 0000000000..5ff6a5f372 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix @@ -0,0 +1,96 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + qtpy, + h5py, + requests, + tomli, + + # tests + pytestCheckHook, + qt6, + pyqt6, + + # passthru.tests + guidata, + pyside6, + qt5, + pyqt5, + pyside2, +}: + +buildPythonPackage rec { + pname = "guidata"; + version = "3.6.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "guidata"; + rev = "refs/tags/v${version}"; + hash = "sha256-KfeA6XNbzHZM4dyvAYlPOQIwWHwFT3Akj34zmgf8tb8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + qtpy + h5py + requests + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to choose a pyqt / pyside + # implementation. + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + pythonImportsCheck = [ "guidata" ]; + + passthru = { + tests = { + # Should be compatible with all of these Qt implementations + withPyQt6 = guidata.override { + pyqt6 = pyqt6; + qt6 = qt6; + }; + withPySide6 = guidata.override { + pyqt6 = pyside6; + qt6 = qt6; + }; + withPyQt5 = guidata.override { + pyqt6 = pyqt5; + qt6 = qt5; + }; + withPySide2 = guidata.override { + pyqt6 = pyside2; + qt6 = qt5; + }; + }; + }; + + meta = { + description = "Python library generating graphical user interfaces for easy dataset editing and display"; + homepage = "https://github.com/PlotPyStack/guidata"; + changelog = "https://github.com/PlotPyStack/guidata/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix index 991eaf9f60..e8d1537b58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, async-timeout, setuptools, @@ -9,19 +9,21 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-FW8WlrhVL+ryupHAKii8fKBku/6uxdw1uLCKUszkP50="; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "ha-ffmpeg"; + rev = "refs/tags/${version}"; + hash = "sha256-Yu23kRChPbq/9sKvu9uY4qtKXX7CVNagZX9Z6ZzDqcw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ async-timeout ]; + dependencies = [ async-timeout ]; # only manual tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 32024f8925..deff078edf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.14.0"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; rev = "refs/tags/v${version}"; - hash = "sha256-vL4EzeU+8nUPyLR22MJtLhknWF4DWMo49EKvkIqIWhA="; + hash = "sha256-IdyrcqRX5YXS6tx5qP7vOnAJpvy5sOsCwFpWMdyYaeI="; }; pythonRelaxDeps = [ "pyaml" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix index 64c39bb8f8..617a2be449 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.6.3"; + version = "3.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = "refs/tags/${version}"; - hash = "sha256-ht4EZBfREU7tDNo6tCPyECjm0H+yuhjsfJ60M4ss0jE="; + hash = "sha256-XefoRAaWq5sPQsrqek6kibRjKU+ZImQmt32jutfptNw="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/histoprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/histoprint/default.nix index 1455189828..080197e883 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/histoprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/histoprint/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "histoprint"; - version = "2.4.0"; + version = "2.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "328f789d186e3bd76882d57b5aad3fa08c7870a856cc83bcdbad9f4aefbda94d"; + sha256 = "sha256-kJfnOWqzqag8kW9+U8Ri6kbk9kXBrZFgRzjy2Dg+/U8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix index 1e2b45a7dc..e65e8e87f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hiyapyco"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - hash = "sha256-KB/KFrR7IScIWyYbsU+4BbV0+SCeeWxYDD8lbxosRLc="; + hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index bf63055df8..56458ceee1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.58"; + version = "0.59"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-qsBKUdYZLSxWAGExydOO37IWqEOrYdlRnE/MJmz7Nr8="; + hash = "sha256-g7ldsWqVWM1FtOB2gFrCuATD5PthZhbelKT4NV6Rovg="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index fc288114c3..c289b781a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.12.2"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-WAsgiOmYqmt/PCKp+vZA2To95YZAgnYCF8ysCn5N9nc="; + hash = "sha256-+2bw4im09TyjJ5/7ct42ZCFwU7yKWQnbSo7b+44VtpE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix index b2aca0e00a..6150c2d09b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix @@ -1,31 +1,31 @@ { lib, + anyio, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, - anyio, httpcore, httpx, - wsproto, pytestCheckHook, + pythonOlder, starlette, trio, uvicorn, + wsproto, }: buildPythonPackage rec { pname = "httpx-ws"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-ws"; rev = "refs/tags/v${version}"; - hash = "sha256-mynr07px+rQb7x8GepQoUgBbh0720S0K2RJrboOoJXA="; + hash = "sha256-VsIYOGNEdX4rxjEa01M77arA3ddJS3cPFxXlf13QTuE="; }; # we don't need to use the hatch-regex-commit plugin @@ -46,8 +46,6 @@ buildPythonPackage rec { wsproto ]; - pythonImportsCheck = [ "httpx_ws" ]; - nativeCheckInputs = [ pytestCheckHook starlette @@ -55,6 +53,8 @@ buildPythonPackage rec { uvicorn ]; + pythonImportsCheck = [ "httpx_ws" ]; + disabledTestPaths = [ # hang "tests/test_api.py" @@ -63,6 +63,8 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket support for HTTPX"; homepage = "https://github.com/frankie567/httpx-ws"; + changelog = "https://github.com/frankie567/httpx-ws/releases/tag/v${version}"; license = licenses.mit; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 6d8e4af86d..4c2a465636 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.25.2"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-wUZkh8ti35F8bGtEKJZGSRySLvCkIWEFajQNWo/WCys="; + hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imgtool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imgtool/default.nix deleted file mode 100644 index ba08366633..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/imgtool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonOlder, - setuptools, - cbor2, - click, - cryptography, - intelhex, - pyyaml, -}: - -buildPythonPackage rec { - pname = "imgtool"; - version = "2.1.0"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - cbor2 - click - cryptography - intelhex - pyyaml - ]; - - pythonImportsCheck = [ "imgtool" ]; - - meta = with lib; { - description = "MCUboot's image signing and key management"; - mainProgram = "imgtool"; - homepage = "https://github.com/mcu-tools/mcuboot"; - license = licenses.asl20; - maintainers = with maintainers; [ samueltardieu ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix index effa0f2cd4..ed8cc71add 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/jpvanhal/inflection"; description = "Port of Ruby on Rails inflector to Python"; - maintainers = with lib.maintainers; [ - NikolaMandic - ilya-kolpakov - ]; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 9360f6d780..712be1f341 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.46.0"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A="; + hash = "sha256-1QWy+mdVttowdbIBmtW6gYwkJ4p9sL0D+DxsHk3xgvc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix index 1199e09eae..4b4787d0a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix @@ -7,16 +7,18 @@ fetchPypi, insightface, matplotlib, - mxnet, numpy, onnx, onnxruntime, opencv4, + pillow, prettytable, pythonOlder, + requests, + setuptools, + scipy, scikit-image, scikit-learn, - tensorboard, testers, tqdm, stdenv, @@ -34,22 +36,26 @@ buildPythonPackage rec { hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; }; - build-system = [ cython ]; + build-system = [ + cython + setuptools + ]; dependencies = [ + albumentations easydict matplotlib - mxnet numpy onnx onnxruntime opencv4 + pillow + prettytable + requests scikit-learn scikit-image - tensorboard + scipy tqdm - albumentations - prettytable ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix deleted file mode 100644 index 1ecceaf832..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, - pythonAtLeast, - setuptools, - tzlocal, - six, - pyjsparser, -}: - -buildPythonPackage rec { - pname = "js2py"; - version = "0.74"; - pyproject = true; - - # broken with Python 3.12 - # https://github.com/PiotrDabkowski/Js2Py/issues/317 - disabled = pythonAtLeast "3.12"; - - src = fetchPypi { - pname = "Js2Py"; - inherit version; - hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - pyjsparser - six - tzlocal - ]; - - # Test require network connection - doCheck = false; - - pythonImportsCheck = [ "js2py" ]; - - meta = with lib; { - description = "JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python"; - homepage = "https://github.com/PiotrDabkowski/Js2Py"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - knownVulnerabilities = [ "CVE-2024-28397" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupysql/default.nix index ec9f512376..350c2e43c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupysql/default.nix @@ -22,7 +22,6 @@ grpcio, ipython, ipywidgets, - js2py, matplotlib, numpy, pandas, @@ -69,7 +68,6 @@ buildPythonPackage rec { grpcio ipython ipywidgets - js2py matplotlib numpy pandas @@ -101,6 +99,9 @@ buildPythonPackage rec { "src/tests/test_plot.py" "src/tests/test_magic.py" "src/tests/test_magic_plot.py" + + # require js2py (which is unmaintained and insecure) + "src/tests/test_widget.py" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix index 5ae844ad91..e699d4d251 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix @@ -1,11 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + + # build-system hatchling, + + # dependencies ipykernel, - exceptiongroup, ipython, jupyter-client, jupyter-core, @@ -13,6 +15,8 @@ pygments, pyzmq, traitlets, + + # tests flaky, pexpect, pytestCheckHook, @@ -21,27 +25,29 @@ buildPythonPackage rec { pname = "jupyter-console"; version = "6.6.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "jupyter_console"; - inherit version; - hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter_console"; + rev = "refs/tags/v${version}"; + hash = "sha256-jdSeZCspcjEQVBpJyxVnwJ5SAq+SS1bW9kqp/F/zwCQ="; }; - nativeBuildInputs = [ hatchling ]; + postPatch = + # Use wrapped executable in tests + let + binPath = "${placeholder "out"}/bin/jupyter-console"; + in + '' + substituteInPlace jupyter_console/tests/test_console.py \ + --replace-fail "'-m', 'jupyter_console', " "" \ + --replace-fail "sys.executable" "'${binPath}'" + ''; - postPatch = '' - # use wrapped executable in tests - substituteInPlace jupyter_console/tests/test_console.py \ - --replace "args = ['-m', 'jupyter_console', '--colors=NoColor']" "args = ['--colors=NoColor']" \ - --replace "cmd = sys.executable" "cmd = '${placeholder "out"}/bin/jupyter-console'" \ - --replace "check_output([sys.executable, '-m', 'jupyter_console'," "check_output(['${placeholder "out"}/bin/jupyter-console'," - ''; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ipykernel ipython jupyter-client @@ -50,7 +56,7 @@ buildPythonPackage rec { pygments pyzmq traitlets - ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; pythonImportsCheck = [ "jupyter_console" ]; @@ -64,6 +70,14 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + disabledTests = [ + # Flaky: pexpect.exceptions.TIMEOUT: Timeout exceeded + "test_console_starts" + "test_display_text" + ]; + + __darwinAllowLocalNetworking = true; + meta = { description = "Jupyter terminal console"; mainProgram = "jupyter-console"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 5dbd5f77fb..8d78b4fab0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.5.0"; + version = "5.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-fjzZPq98AwNT+tiTvKZY2QsSD+FRUFx+oY84hPP7QdI="; + hash = "sha256-KaEXBNGcJN88gIv7suKcr1pK4ih/QbByxEy3nZFlIgk="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index 9ee9110ef0..bb5a0bdc2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://keras.io"; changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ NikolaMandic ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index 85f690d93d..30cdce6885 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { "lark.grammars" ]; - # Js2py is needed for tests but it's marked as insecure + # Js2py is needed for tests but it's unmaintained and insecure doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lcd-i2c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lcd-i2c/default.nix index 27d9716cd1..554b30b9bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lcd-i2c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lcd-i2c/default.nix @@ -1,9 +1,10 @@ { lib, - fetchPypi, buildPythonPackage, - smbus2, + fetchPypi, poetry-core, + pythonOlder, + smbus2, }: buildPythonPackage rec { @@ -11,14 +12,24 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; hash = "sha256-NYBaCXBmuTziT0WYEqrW10HRmRy3jpjH3YWQh5Y/TdQ="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "smbus2" ]; - propagatedBuildInputs = [ smbus2 ]; + build-system = [ poetry-core ]; + + dependencies = [ smbus2 ]; + + # Module has no tests + doCheck = false; + + # Needs /dev/i2c-1 + # pythonImportsCheck = [ "lcd_i2c" ]; meta = with lib; { description = "Library for interacting with an I2C LCD screen through Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix index 0f1697c7f6..f17dfec590 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, + distutils, }: buildPythonPackage rec { pname = "lcov-cobertura"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { @@ -17,6 +19,9 @@ buildPythonPackage rec { hash = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q="; }; + build-system = [ setuptools ]; + dependencies = [ distutils ]; + doCheck = true; pythonImportsCheck = [ "lcov_cobertura" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 3ccf4c8e12..01dab0b558 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -23,23 +23,23 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "instagram"; - repo = "libcst"; + owner = "Instagram"; + repo = "LibCST"; rev = "refs/tags/v${version}"; - hash = "sha256-H0YO8ILWOyhYdosNRWQQ9wziFk0syKSG3vF2zuYkL2k="; + hash = "sha256-0r2xQ8QVmA4I6eZHBWd/U1fQ8nK5rdblIoMACudOYPY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-AcqHn3A7WCVyVnOBD96k4pxokhzgmCWOipK/DrIAQkU="; + hash = "sha256-mexXuOsL1+F/GL2wMf/pwK7bJLFRgPtPSYE4W3E0VQ0="; }; cargoRoot = "native"; @@ -92,7 +92,7 @@ buildPythonPackage rec { meta = { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; - homepage = "https://github.com/Instagram/libcst"; + homepage = "https://github.com/Instagram/LibCST"; changelog = "https://github.com/Instagram/LibCST/blob/v${version}/CHANGELOG.md"; license = with lib.licenses; [ mit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix index 77c0d00d0f..fc26b32484 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix @@ -2,28 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, - enum-compat, requests, websocket-client, zeroconf, pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "libsoundtouch"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CharlesBlonde"; repo = "libsoundtouch"; - rev = version; - sha256 = "1wl2w5xfdkrv0qzsz084z2k6sycfyq62mqqgciycha3dywf2fvva"; + rev = "refs/tags/${version}"; + hash = "sha256-am8nHPdtKMh8ZA/jKgz2jnltpvgEga8/BjvP5nrhgvI="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'enum-compat>=0.0.2'," "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests - enum-compat websocket-client zeroconf ]; @@ -36,9 +45,12 @@ buildPythonPackage rec { "test_snapshot_restore" ]; + pythonImportsCheck = [ "libsoundtouch" ]; + meta = with lib; { description = "Bose Soundtouch Python library"; homepage = "https://github.com/CharlesBlonde/libsoundtouch"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lineax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lineax/default.nix index 8f547bc1d9..2680211c58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lineax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lineax/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "lineax"; - version = "0.0.6"; + version = "0.0.7"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "lineax"; rev = "refs/tags/v${version}"; - hash = "sha256-rM3H+q75F98eEIJkEszWgxD5C5vGK5RlYtVv8GD/VC0="; + hash = "sha256-HcFI55Ww/y7ZaUkawj7xWSb7VDTBec3u0ulWL8kTm2c="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lm-format-enforcer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lm-format-enforcer/default.nix index f615bea492..3abbc92bcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lm-format-enforcer"; - version = "0.10.7"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "noamgat"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-25/qnSKBXbyAnasNYuv+LV2U2KLipKtH6B+wXlH6eRs="; + hash = "sha256-8+hve/6YezM07+4BmmBEAPZ0B2d8xDguXoHf7FuQWP8="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 5887818342..b285141cf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-k2i6oZudY59CmFt5qlWCCtZgywcbLHR9OUYIannSZ20="; + hash = "sha256-6U/oAVqzNsKFgNtQPzDovoWR23J0Ax0ssCIUjjRVeR4="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix index b0bfc0ca15..2cc0277d6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.26.1"; + version = "0.26.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-YV9Cncry+RXXGxRYN4dXp5E2msGA4Kq2QSvcPywWV2c="; + hash = "sha256-xZKE8+bNHL+GSQS00MlShOl/3p7+mRV558Pel50ipOI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monkeytype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monkeytype/default.nix new file mode 100644 index 0000000000..1f24608c8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/monkeytype/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + libcst, + mypy-extensions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "monkeytype"; + version = "23.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Instagram"; + repo = "MonkeyType"; + rev = "refs/tags/v${version}"; + hash = "sha256-DQ/3go53+0PQkhZcL2dX8MI/z4Iq7kTYd5EbacMNxT4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + libcst + mypy-extensions + ]; + + pythonImportsCheck = [ + "monkeytype" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Disable broken tests + "test_excludes_site_packages" + "test_callee_throws_recovers" + "test_nested_callee_throws_recovers" + "test_caller_handles_callee_exception" + "test_generator_trace" + "test_return_none" + "test_access_property" + ]; + + meta = { + description = "Python library that generates static type annotations by collecting runtime types"; + homepage = "https://github.com/Instagram/MonkeyType/"; + changelog = "https://github.com/Instagram/MonkeyType/blob/${src.rev}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix index 0c6baa8b3e..f709927149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mplhep-data"; - version = "0.0.3"; + version = "0.0.4"; format = "pyproject"; src = fetchPypi { pname = "mplhep_data"; inherit version; - hash = "sha256-tU0lfz9TyTpELNp6ZoHOJnJ34JFzwLQf14gg94Mhdy8="; + hash = "sha256-zR8606+dv/M67550BtITDWJKC9HVqllw/HE6ZCEWWk4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix index e6d5a47b0f..b5cc00a669 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.9.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9i0AUljcU4dZSNkgqJnKtKobWCSkBGP8vwCbVSbxw/E="; + hash = "sha256-SBQ99NJFVwsqyExadw/jvToeZuUzi7+/wQxS8YMwrNM="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix index c746e8c521..3f208bd9f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nebula3-python"; - version = "3.8.2"; + version = "3.8.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vesoft-inc"; repo = "nebula-python"; rev = "refs/tags/v${version}"; - hash = "sha256-XwrrT5Vuwqw57u3Xt9nS4NjmFG2VD62gWSVfeek2478="; + hash = "sha256-p2dXpcOwVKbdfRKKTAc4LhaNuTjvPd8BBBI8aUivaZ4="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix index cba7bfe4b6..b1538e871a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.12.0"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-Sqwwk++iA/PsAKZRkUPjXuzgSrhnH4N02c072pIVEyw="; + hash = "sha256-azAVvVAlG74wgH/96+sc6S9XQLRFZgR4aU6d4gy43PQ="; }; build-system = [ setuptools ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "nibe" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix index fa22c3e355..7be8de7830 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "nitrokey"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oWfhy7Mj1UnrC70G7fpkl4q4uG0CdvO0BHwfJYszR30="; + hash = "sha256-Hn/CYvuPRkT9NYzfB8skN3Z732xfmHu6xDTVI/nDbqU="; }; disabled = pythonOlder "3.9"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index fd1911a818..bf7bac7f99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,28 +2,32 @@ lib, buildPythonPackage, cython, - enum34, fetchPypi, - nine, numpy, pytestCheckHook, python-utils, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "numpy-stl"; - version = "3.1.1"; - format = "setuptools"; + version = "3.1.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; + pname = "numpy_stl"; + inherit version; + hash = "sha256-crRpUN+jZC3xx7hzz6eKVIUzckuQdHjFZ9tC/fV+49I="; }; - propagatedBuildInputs = [ - cython - enum34 - nine + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; + + dependencies = [ numpy python-utils ]; @@ -35,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; + changelog = "https://github.com/wolph/numpy-stl/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix index d9c9002b89..fd90c13e6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix @@ -29,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.27.1"; + version = "2.28.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; rev = "refs/tags/v${version}"; - hash = "sha256-1wOxnpNEipA0N6o4b5JCsrAtBnGP7x+MPXmVIjfDmLI="; + hash = "sha256-wHqSADiKlRyJXf3CCrXlSj6tpVVSdO8GVsKInl+OMrc="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optimistix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optimistix/default.nix index a7cb8b7c5e..5e28091337 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optimistix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optimistix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "optimistix"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "optimistix"; rev = "refs/tags/v${version}"; - hash = "sha256-0ehNApiBoiAb8LFBW81ZCRPsjTVQG8zRTVSAp7oHF8w="; + hash = "sha256-s8MRPyPObTpgLRm4bxU8F4Su7FKH+MHqtQsxIHb/DN4="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parselmouth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parselmouth/default.nix index 43e718c133..78417fe48c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parselmouth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parselmouth/default.nix @@ -14,17 +14,16 @@ buildPythonPackage rec { pname = "parselmouth"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "YannickJadoul"; repo = "Parselmouth"; - # Stable branch with cherry picked changes to fit to the newer dependencies versions https://github.com/YannickJadoul/Parselmouth/issues/130 - rev = "c2cbecc0ce4a0b5d3052cc6c6fbddf4bf133655d"; + rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+6id0PVfpiVjee7O4ZoskNK0dz5ZmTYRTtum3B3tIgE="; + hash = "sha256-/Hde/DpSbmHs8WF3PAk4esYuMgOX6SxMaYJrrHYr/ZU="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index f979e9b751..a372d124ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -8,15 +8,15 @@ pdoc-pyo3-sample-library, pygments, markupsafe, - astunparse, pytestCheckHook, hypothesis, + nix-update-script, }: buildPythonPackage rec { pname = "pdoc"; - version = "14.7.0"; - disabled = pythonOlder "3.8"; + version = "15.0.0"; + disabled = pythonOlder "3.9"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-U6gLEuyKvGGP5yKXb+bWDGJqmHTdPYLLPgHLVySAJ6I="; + hash = "sha256-6XEcHhaKkxY/FU748f+OsTcSgrM4iQTmJAL8rJ3EqnY="; }; nativeBuildInputs = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { jinja2 pygments markupsafe - ] ++ lib.optional (pythonOlder "3.9") astunparse; + ]; nativeCheckInputs = [ pytestCheckHook @@ -54,6 +54,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pesq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pesq/default.nix new file mode 100644 index 0000000000..d8111f3a45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pesq/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + numpy, + setuptools, + + # tests + pytestCheckHook, + scipy, +}: + +buildPythonPackage rec { + pname = "pesq"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ludlows"; + repo = "PESQ"; + rev = "refs/tags/v${version}"; + hash = "sha256-JuwZ+trFKGMetS3cC3pEQsV+wbj6+klFnC3THOd8bPE="; + }; + + postPatch = + # pythonRemoveDeps does not work for removing pytest-runner + '' + substituteInPlace setup.py \ + --replace-fail ", 'pytest-runner'" "" + '' + # Flaky tests: numerical equality is not satisfied on ARM platforms + + '' + substituteInPlace tests/test_pesq.py \ + --replace-fail \ + "assert score == 1.6072081327438354" \ + "assert abs(score - 1.6072081327438354) < 1e-5" \ + --replace-fail \ + "assert score == [1.6072081327438354]" \ + "assert np.allclose(np.array(score), np.array([1.6072081327438354]))" + ''; + + build-system = [ + cython + setuptools + numpy + ]; + + dependencies = [ + numpy + ]; + + pythonImportsCheck = [ + "pesq" + "pesq.cypesq" + ]; + + # Prevents importing the `pesq` module from the source files (which lack the cypesq extension) + preCheck = '' + rm -rf pesq + ''; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ]; + + meta = { + description = "PESQ (Perceptual Evaluation of Speech Quality) Wrapper for Python Users"; + homepage = "https://github.com/ludlows/PESQ"; + changelog = "https://github.com/ludlows/PESQ/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix index 58afee646c..5cf06d322f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.26.1"; + version = "1.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-zVwsRTsxic0/K6HyTLVRYCnBpSIF9Ly0TRJS90nADTg="; + hash = "sha256-JSgWOHMwjxStwMxRe4sFYLeRRgOkfWXlIpqeDfGDSNQ="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotpy/default.nix new file mode 100644 index 0000000000..081a9bc25f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotpy/default.nix @@ -0,0 +1,117 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython_0, + setuptools, + + # dependencies + guidata, + numpy, + pillow, + pythonqwt, + scikit-image, + scipy, + tifffile, + + # tests + pytestCheckHook, + qt6, + pyqt6, + + # passthru.tests + plotpy, + pyside6, + qt5, + pyqt5, + pyside2, +}: + +buildPythonPackage rec { + pname = "plotpy"; + version = "2.6.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "PlotPy"; + rev = "refs/tags/v${version}"; + hash = "sha256-kMVq8X6XP18B5x35BTuC7Q5uFFwds1JxCaxlDuD/UfE="; + }; + + build-system = [ + cython_0 + setuptools + ]; + # Both numpy versions are supported, see: + # https://github.com/PlotPyStack/PlotPy/blob/v2.6.2/pyproject.toml#L8-L9 + postConfigure = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy >= 2.0.0' numpy + ''; + + dependencies = [ + guidata + numpy + pillow + pythonqwt + scikit-image + scipy + tifffile + ]; + + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to choose a pyqt / pyside + # implementation. + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + # https://github.com/NixOS/nixpkgs/issues/255262 + cd $out + ''; + + pythonImportsCheck = [ + "plotpy" + "plotpy.tests" + ]; + + passthru = { + tests = { + # Upstream doesn't officially supports all of them, although they use + # qtpy, see: https://github.com/PlotPyStack/PlotPy/issues/20 . When this + # package was created, all worked besides withPySide2, with which there + # was a peculiar segmentation fault during the tests. In anycase, PySide2 + # shouldn't be used for modern applications. + withPyQt6 = plotpy.override { + pyqt6 = pyqt6; + qt6 = qt6; + }; + withPySide6 = plotpy.override { + pyqt6 = pyside6; + qt6 = qt6; + }; + withPyQt5 = plotpy.override { + pyqt6 = pyqt5; + qt6 = qt5; + }; + withPySide2 = plotpy.override { + pyqt6 = pyside2; + qt6 = qt5; + }; + }; + }; + + meta = { + description = "Curve and image plotting tools for Python/Qt applications"; + homepage = "https://github.com/PlotPyStack/PlotPy"; + changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 41d4f3ceca..d786be3c6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-JzHDmespyQ4+I7+6vbu/jqK70b71FJvoO0wDR6MnIaw="; + hash = "sha256-eeytJ9X2ChcQDbAfTUPokMl/qKVSU6PUuI/a30xJ6WU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pocketsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pocketsphinx/default.nix new file mode 100644 index 0000000000..16a173efc6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pocketsphinx/default.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildPythonPackage, + cmake, + cython, + fetchFromGitHub, + memory-profiler, + ninja, + pathspec, + pocketsphinx, + pytestCheckHook, + scikit-build, + scikit-build-core, + sounddevice, +}: + +buildPythonPackage rec { + inherit (pocketsphinx) version src; + pname = "pocketsphinx"; + pyproject = true; + + dontUseCmakeConfigure = true; + + env.CMAKE_ARGS = lib.cmakeBool "USE_INSTALLED_POCKETSPHINX" true; + + buildInputs = [ pocketsphinx ]; + + build-system = [ + cmake + cython + ninja + pathspec + scikit-build-core + ]; + + dependencies = [ sounddevice ]; + + nativeCheckInputs = [ + memory-profiler + pytestCheckHook + ]; + + pythonImportsCheck = [ "pocketsphinx" ]; + + meta = with lib; { + description = "Small speech recognizer"; + homepage = "https://github.com/cmusphinx/pocketsphinx"; + changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS"; + license = with licenses; [ + bsd2 + bsd3 + mit + ]; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix index 08fb2795bd..c2e34a3165 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -1,10 +1,11 @@ { lib, - betamax, betamax-matchers, betamax-serializers, + betamax, buildPythonPackage, fetchFromGitHub, + flit-core, mock, prawcore, pytestCheckHook, @@ -16,19 +17,21 @@ buildPythonPackage rec { pname = "praw"; - version = "7.7.1"; - format = "setuptools"; + version = "7.8.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "praw-dev"; - repo = pname; + repo = "praw"; rev = "refs/tags/v${version}"; - hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo="; + hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA="; }; - propagatedBuildInputs = [ + build-system = [ flit-core ]; + + dependencies = [ mock prawcore update-checker diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix index 12df2934bf..91bffd81e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.2.0"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; + hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix deleted file mode 100644 index 4bb419d21b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-keyring-linux, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-keyring-linux-secretservice"; - version = "0.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-keyring-linux-secretservice"; - rev = "refs/tags/v${version}"; - hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-keyring-linux ]; - - pythonImportsCheck = [ "proton.keyring_linux" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "ProtonVPN component to access Linux's keyring secret service API"; - homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix index 51617e71a0..56bd41fea4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; + hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys="; }; build-system = [ setuptools ]; @@ -28,7 +28,10 @@ buildPythonPackage rec { proton-core ]; - pythonImportsCheck = [ "proton.keyring_linux.core" ]; + pythonImportsCheck = [ + "proton.keyring_linux.core" + "proton.keyring_linux" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 219dd94b31..b98536954e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -2,12 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + cryptography, setuptools, + jinja2, proton-core, - proton-vpn-connection, - proton-vpn-logger, - proton-vpn-killswitch, - proton-vpn-session, + pynacl, + aiohttp, + pyopenssl, + pytest-asyncio, + requests, sentry-sdk, distro, pytestCheckHook, @@ -16,36 +19,47 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.32.2"; + version = "0.35.5"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; + hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ + cryptography distro + jinja2 + pynacl proton-core - proton-vpn-connection - proton-vpn-logger - proton-vpn-killswitch - proton-vpn-session sentry-sdk ]; - pythonImportsCheck = [ "proton.vpn.core" ]; + pythonImportsCheck = [ + "proton.vpn.core" + "proton.vpn.connection" + "proton.vpn.killswitch.interface" + "proton.vpn.logging" + "proton.vpn.session" + ]; nativeCheckInputs = [ + aiohttp + pyopenssl + pytest-asyncio + requests pytestCheckHook pytest-cov-stub ]; - preCheck = '' + postInstall = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix deleted file mode 100644 index 7da811dc3a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - proton-vpn-killswitch, - proton-vpn-logger, - jinja2, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-connection"; - version = "0.14.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-connection"; - rev = "refs/tags/v${version}"; - hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - jinja2 - proton-core - proton-vpn-killswitch - proton-vpn-logger - ]; - - pythonImportsCheck = [ "proton.vpn.connection" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - disabledTests = [ - # Permission denied: '/run' - "test_ensure_configuration_file_is_deleted" - "test_ensure_generate_is_returning_expected_content" - "test_ensure_same_configuration_file_in_case_of_duplicate" - "test_ensure_configuration_file_is_created" - "test_wireguard_config_content_generation" - "test_wireguard_with_malformed_credentials" - "test_wireguard_with_non_certificate" - "test_wireguard_without_settings" - # Neiter udp or tcp are working - "test_ovpnconfig_with_settings" - "test_ovpnconfig_with_missing_settings_applies_expected_defaults" - "test_ovpnconfig_with_malformed_params" - "test_ovpnconfig_with_certificate_and_malformed_credentials" - "test_ovpnconfig_with_malformed_server" - "test_ovpnconfig_with_malformed_server_and_credentials" - ]; - - meta = { - description = "Defines the interface that VPN connection backends should implement"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix deleted file mode 100644 index 8ff9321fc5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - iproute2, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager-wireguard"; - version = "0.1.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-4sYD2X1U066FMjrtbTb31wvkCDWAw+eXod+pi0gGsCQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - postPatch = '' - substituteInPlace proton/vpn/killswitch/backend/linux/wireguard/killswitch_connection_handler.py \ - --replace '/usr/sbin/ip' '${iproute2}/bin/ip' - ''; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.wireguard" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager with wireguard-protocol"; - homepage = "https://github.com/ProtonVPN/proton-vpn-killswitch-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix deleted file mode 100644 index c8d3074193..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager"; - version = "0.5.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager"; - rev = "refs/tags/v${version}"; - hash = "sha256-iUm+hpqgI4jG+1Cd9F6pBjodxHpq9/2ovXRT877biXQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix deleted file mode 100644 index ae83dd1e5b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch"; - version = "0.4.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch"; - rev = "v${version}"; - hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Defines the ProtonVPN kill switch interface"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-logger/default.nix deleted file mode 100644 index 402b6e0e49..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-logger"; - version = "0.2.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-logger"; - rev = "refs/tags/v${version}"; - hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.logging" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - meta = { - description = "General purpose logging package for the entire ProtonVPN Linux client"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix deleted file mode 100644 index 25c9715e7e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-openvpn"; - version = "0.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-openvpn"; - rev = "refs/tags/v${version}"; - hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-network-manager - ]; - - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the OpenVPN protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix deleted file mode 100644 index e32a4b5a1b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-killswitch-network-manager-wireguard, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-wireguard"; - version = "0.4.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-killswitch-network-manager-wireguard - proton-vpn-network-manager - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the Wireguard protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index fea0d2e304..4e32a915fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -3,11 +3,13 @@ buildPythonPackage, fetchFromGitHub, gobject-introspection, + apt, + iproute2, setuptools, networkmanager, proton-core, proton-vpn-api-core, - proton-vpn-connection, + proton-vpn-local-agent, pycairo, pygobject3, pytest-asyncio, @@ -17,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.5.2"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-hTJE9sUjPMsE9d0fIA/OhoasumtfsWuFwn0aTm10PN4="; + hash = "sha256-dwWEcLowNlIoxeVQnEpmI+PK18DQRiW4A4qfWHSqRw8="; }; nativeBuildInputs = [ @@ -41,12 +43,23 @@ buildPythonPackage rec { networkmanager proton-core proton-vpn-api-core - proton-vpn-connection + proton-vpn-local-agent pycairo pygobject3 ]; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; + postPatch = '' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/killswitch_connection_handler.py \ + --replace '/usr/sbin/ip' '${iproute2}/bin/ip' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py \ + --replace '/usr/bin/apt' '${apt}/bin/apt' + ''; + + pythonImportsCheck = [ + "proton.vpn.backend.linux.networkmanager" + "proton.vpn.backend.linux.networkmanager.killswitch.default" + "proton.vpn.backend.linux.networkmanager.killswitch.wireguard" + ]; nativeCheckInputs = [ pytestCheckHook @@ -54,6 +67,11 @@ buildPythonPackage rec { pytest-asyncio ]; + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + meta = { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix deleted file mode 100644 index ee27bfb9b4..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - cryptography, - distro, - proton-core, - proton-vpn-logger, - pynacl, - aiohttp, - pyopenssl, - pytest-asyncio, - requests, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-session"; - version = "0.6.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-session"; - rev = "refs/tags/v${version}"; - hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ - cryptography - distro - proton-core - proton-vpn-logger - pynacl - ]; - - pythonImportsCheck = [ "proton.vpn.session" ]; - - postInstall = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - aiohttp - pyopenssl - pytest-asyncio - requests - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Provides utility classes to manage VPN sessions"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 28476b0104..b2f284b4f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241017"; + version = "1.0.2.20241019"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OHp7MYu9eo3hWQFKChuB1Yw8Lqal8NXJoERAVv1pS78="; + hash = "sha256-OvnRc+PV0rJxTgN4nPf9znsJtMTVU16nKTwdDA140Wc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix index df72926be3..87dcc8812f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pure-protobuf"; - version = "3.1.2"; + version = "3.1.3"; format = "pyproject"; # < 3.10 requires get-annotations which isn't packaged yet @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "eigenein"; repo = "protobuf"; rev = "refs/tags/${version}"; - hash = "sha256-up/01Q2IdaW41Ple+nCRpWjYnl/IAlOppdGcg4djRZY="; + hash = "sha256-AsiJDi3SF3nlWKFvZujUsoHY8AJ21JKzEuTdR9FtFQI="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix index 2ed166b9a7..7fe8e47b69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-qggtwz6cSz5mLKLVY0i7gWs09EcOoxlWWQoHZv+TDc8="; + hash = "sha256-aIpIeDJGMfNVzeXY8GaPOYKam2HxcdHgSOhOoGmGDoc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyblu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyblu/default.nix index 867ca8ba31..c149661969 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyblu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyblu/default.nix @@ -12,16 +12,18 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; rev = "refs/tags/v${version}"; - hash = "sha256-1H7TqFPVstB+nCYwWOT8E2HcmkLQx9pekBq2WIAf8DQ="; + hash = "sha256-BDuptBC72XG+q/5MlbPMjYDIhWKg4gfEo2pLOflwQaM="; }; + pythonRelaxDeps = [ "aiohttp" ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock index 64065cc4cd..8acdc7ca21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "lock_api" @@ -235,16 +235,16 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.10.3" +version = "0.10.4" dependencies = [ "pyo3", "yrs", @@ -365,9 +365,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -392,9 +392,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix index cfaae0cc4c..37730c78fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/v${version}"; - hash = "sha256-Z7u0ix9IjXaq0OKgH3Yvt5cAmAYSCyHT/ZcPLANuVzU="; + rev = "refs/tags/${version}"; + hash = "sha256-nKjXEXvEIGtwbSoabz7UBsx4nfsCgUXm+JdSL5Z/b38="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index 23f9353ac9..f2633d060b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -13,23 +13,23 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.20"; + version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-d6EeeNem+HfuipKF5ZOI48c11j0ozGrBP4XlqTx+fJ4="; + hash = "sha256-ZLFcaWzu8iYBnbSh1Ua4fvFyYD5q71R/iIqzRUKRn1E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ graphviz ]; - propagatedBuildInputs = [ + dependencies = [ graphviz stdlib-list ]; @@ -55,10 +55,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module dependency visualization"; - mainProgram = "pydeps"; homepage = "https://github.com/thebjorn/pydeps"; changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "pydeps"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix index 25e9078d5c..a23a0ce879 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.39"; + version = "0.2.40"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-Q7fql+IEEdfGlY8Uq3D7Y0+17Hg5oLjMn8Nq1HA2HMQ="; + hash = "sha256-3o4KnWau2Sxkj18ZoY6EsSszm0Z0Z1Gz/KWr1ZH7FTs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index a585080103..73960fec7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; teams.geospatial.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix index 284fb8368f..e3d051ab07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix @@ -12,12 +12,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "pyipp"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-ipp"; rev = "refs/tags/${version}"; - hash = "sha256-ddI9K0lJDZbVgO+hptP4I+EH//5vOoFDYXWxGALF8Ik="; + hash = "sha256-B3x6WkTSTGlZWMAK2BTA2EVVz+IvB3QL+arZGBAkZsE="; }; postPatch = '' @@ -49,6 +50,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix index 0b6eab26b5..b0988585e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, buildPythonPackage, pytestCheckHook, - js2py, }: let @@ -21,18 +20,11 @@ let nativeCheckInputs = [ pytestCheckHook - js2py ]; - # escape infinite recursion with js2py + # js2py is needed for tests but it's unmaintained and insecure doCheck = false; - passthru.tests = { - check = pyjsparser.overridePythonAttrs (_: { - doCheck = true; - }); - }; - pythonImportsCheck = [ "pyjsparser" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix index f051004a49..4de059acab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.15"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1UUW3Ym11jR4dxSS1OOVPl6h69I6H782Q4ZeVitty0c="; + hash = "sha256-SuG5x8GWTsCOve3jj1hrtsm37yNRHVFuFjapQafHTbA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index edf4a4bfe7..3af43a63a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -31,7 +31,7 @@ let in buildPythonPackage rec { pname = "pyopencl"; - version = "2024.2.7"; + version = "2024.3"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { repo = "pyopencl"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-VeaEDYnGfMYf9/WqMIZ9g4KounD48eWF3Romt79RMEQ="; + hash = "sha256-HE7dARgKnZxqjAXX4iI1ml0N2BalyTo+ZAzjC2ThEN8="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypoint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypoint/default.nix index d7062da6c8..c144811f9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypoint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypoint/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pypoint"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; - rev = "v${version}"; - hash = "sha256-Ri+vf/vnjQQ+9eZ1Gzt+v68FAxVGt0IY9S3SpeVem3A="; + rev = "refs/tags/v${version}"; + hash = "sha256-9z9VcY42uHIksIvDU1Vz+kvXNmrCu08fGB/waQahmyg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix index 88324b4ef4..cd43bb9211 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.9.4"; + version = "10.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = "pysqueezebox"; rev = "refs/tags/v${version}"; - hash = "sha256-xi+mjrEF581NL8iRlEijKEO1CgXUr+u5hgq6UJWfoXA="; + hash = "sha256-p9EwzkKkNi/jGMXx4sPTSpPk3Uq3Na8WElolNryu2N4="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index bb46fdeb5d..7c5b303c70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.48.2"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-5hoV7tM02dLrGvZ47ReVITayLFf2ceRVXOKbNa2t9iM="; + hash = "sha256-GA5BioH1z8N6I65q+7vSHM/eetN5dXSMZZ2hoQ8+0QA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 3bdb639be4..5f488ef174 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -25,25 +25,23 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.2"; + version = "0.34.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-1/eLJFXACn1W5Yz43BIhdqqUVk3t9285d8aLwH+VmAE="; + hash = "sha256-HQ9VVgRfF5qA36yOyKT63gXuKNLLjouqYKz5EuqGA2E="; }; pythonRelaxDeps = [ "boto3" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-fsutil python-slugify requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix index 04c6e81d39..b08d82bb3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix @@ -1,29 +1,33 @@ { lib, buildPythonPackage, - enum-compat, fetchFromGitHub, pytestCheckHook, unicodecsv, + pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "python-registry"; version = "1.4"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "williballenthin"; - repo = pname; - rev = version; - sha256 = "0gwx5jcribgmmbz0ikhz8iphz7yj2d2nmk24nkdrjd3y5irly11s"; + repo = "python-registry"; + rev = "refs/tags/${version}"; + hash = "sha256-OgRPcyx+NJnbtETMakUT0p8Pb0Qfzgj+qvWtmJksnT8="; }; - propagatedBuildInputs = [ - enum-compat - unicodecsv - ]; + pythonRemoveDeps = [ "enum-compat" ]; + + build-system = [ setuptools ]; + + dependencies = [ unicodecsv ]; nativeCheckInputs = [ pytestCheckHook @@ -35,8 +39,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "Registry" ]; meta = with lib; { - description = "Pure Python parser for Windows Registry hives"; + description = "Module to parse the Windows Registry hives"; homepage = "https://github.com/williballenthin/python-registry"; + changelog = "https://github.com/williballenthin/python-registry/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 289a4e4100..1385f887bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-Mszy1p7TOEynCePCEiLhwdWiKXfFnlo3/a3vc9TxGeY="; + hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonqwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonqwt/default.nix new file mode 100644 index 0000000000..1eb3e3e2ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonqwt/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + qtpy, + + # tests + pyqt6, + qt6, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pythonqwt"; + version = "0.12.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "PythonQwt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Am7XYumq9PAOmT2ZTC+AAE4VM6/yNF11WLXoTFSbDh4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + qtpy + numpy + ]; + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to either choose a pyqt / + # pyside implementation + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + pythonImportsCheck = [ "qwt" ]; + + meta = { + description = "Qt plotting widgets for Python (pure Python reimplementation of Qwt C++ library)"; + homepage = "https://github.com/PlotPyStack/PythonQwt"; + changelog = "https://github.com/PlotPyStack/PythonQwt/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index ec0f4987e6..a63c65ffef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.122"; + version = "9.2.123"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-YfOjjDlu2bkwUGGm0Sk0QfG+uJcezYKjQvditRLYPT8="; + hash = "sha256-uojU1x4VfiYFM3ZSwSy5qPpWBSEq9CKwByk2HFAXvXA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix index 65c469091e..73973a6ad9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix @@ -13,21 +13,21 @@ buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.23"; + version = "0.2.25"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; rev = "refs/tags/${version}"; - hash = "sha256-J+oJQHsULrJQNdZqYsl2hufNubMwV1KtG10jZH0jbU4="; + hash = "sha256-c0HlmqLvpIn2GXorOArBKJ0YzvWz1spmhWwm6Gow2iU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml typing-extensions zeroconf @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/Julius2342/pyvlx"; changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${version}"; - license = with licenses; [ lgpl2Only ]; + license = licenses.lgpl2Only; maintainers = with maintainers; [ fab ]; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index e14d4ab416..5099900a29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -2,42 +2,47 @@ lib, buildPythonPackage, fetchPypi, - mock, + pythonAtLeast, + + # build-system + poetry-core, + + # dependencies pillow, pypng, + + # tests + mock, pytestCheckHook, - pythonAtLeast, qrcode, - setuptools, testers, - typing-extensions, }: buildPythonPackage rec { pname = "qrcode"; - version = "7.4.2"; + version = "8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ndlpRUgn4Sfb2TaWsgdHI55tVA4IKTfJDxSslbMPWEU="; + hash = "sha256-AlzisVD3/kKW0Rbum61FWmZDq09ufc5UFhOkdYy840c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - typing-extensions - pypng - # imports pkg_resouces in console_scripts.py - setuptools - ]; - - optional-dependencies.pil = [ pillow ]; + optional-dependencies = { + pil = [ pillow ]; + png = [ pypng ]; + all = [ + pypng + pillow + ]; + }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ optional-dependencies.pil; + ] ++ lib.flatten (lib.attrValues optional-dependencies); passthru.tests = { version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix deleted file mode 100644 index b920d7421f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytest, - isPy3k, - pyqt5, - pyqt ? pyqt5, - fetchpatch, -}: - -buildPythonPackage rec { - pname = "quamash"; - version = "0.6.1"; - format = "setuptools"; - - disabled = !isPy3k; - - # No tests in PyPi tarball - src = fetchFromGitHub { - owner = "harvimt"; - repo = "quamash"; - rev = "version-${version}"; - sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; - }; - - patches = [ - # add 3.10 compatibility, merged remove on next update - (fetchpatch { - url = "https://github.com/harvimt/quamash/pull/126/commits/1e9047bec739dbc9d6ab337fc1a111a8b1090244.patch"; - hash = "sha256-6gomY82AOKkrt32SEBKnRugzhnC5FAyKDs6K5xaxnRM="; - }) - ]; - - propagatedBuildInputs = [ pyqt ]; - - nativeCheckInputs = [ pytest ]; - checkPhase = '' - pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio - ''; - - meta = with lib; { - description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; - homepage = "https://github.com/harvimt/quamash"; - license = licenses.bsd2; - maintainers = with maintainers; [ borisbabic ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index b417ea9269..2b573e439d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.9.6"; + version = "0.9.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-pSHsQ2bJ0zNk6eJfDERVFqZM/IWorL8HFFjnwnhaHhY="; + hash = "sha256-3OSD+L6+mZkkm0OU09hAFyEAxJZ3YA1+lRm2DjQ7Dl0="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index ddc6071451..a20d602ebb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.1"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-nzkgJdSWbFcAnAqRTq4+Wy1lqdz+Xxf2i4RKnj/A5SA="; + hash = "sha256-AJMJb8FN+KynxJXI7s7PwyM/+UpXCtWTcRK/fhCg+io="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix index fb458d9d06..e8fb3446dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -13,33 +14,31 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.6.2"; + version = "1.7.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "sensorpush-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-IZ2QSAHRdpDKFQYfqkcUm1o+7GaI8e50gEFRK3BV3s8="; + hash = "sha256-etsrXJn6n9yL0vhiZNnTepCcau50X0t2wPrhZ9R7XL4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpush_ble --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "sensorpush_ble" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix index c70ea216cd..895b71d8ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-T9y+usEOqz53Wv5gObD5o3gAlABHM3apoq/ySD5ynVg="; + hash = "sha256-5N5yObR3+3eV65ojFJFhzDbqtjNi/U2IhHlAaKttcVI="; }; build-system = [ setuptools ]; @@ -65,11 +65,16 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_cmnrl_same_grad" + "test_forward" + "test_initialization_with_embedding_dim" + "test_initialization_with_embedding_weights" "test_LabelAccuracyEvaluator" "test_model_card_reuse" "test_paraphrase_mining" "test_ParaphraseMiningEvaluator" + "test_save_and_load" "test_simple_encode" + "test_tokenize" "test_trainer" "test_trainer_invalid_column_names" "test_trainer_multi_dataset_errors" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix index f6ddf55407..9a1708593f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix @@ -1,25 +1,27 @@ { lib, + attrs, buildPythonPackage, fetchPypi, - isPy27, - enum34, - attrs, - pytz, pytestCheckHook, + pythonOlder, + pytz, + setuptools, }: buildPythonPackage rec { pname = "serpent"; version = "1.41"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; }; - propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; + build-system = [ setuptools ]; nativeCheckInputs = [ attrs @@ -27,9 +29,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "serpent" ]; + meta = with lib; { description = "Simple serialization library based on ast.literal_eval"; homepage = "https://github.com/irmen/Serpent"; + changelog = "https://github.com/irmen/Serpent/releases/tag/serpent-${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shaperglot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shaperglot/default.nix index 20c898c076..9a5d761acf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shaperglot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shaperglot/default.nix @@ -6,9 +6,10 @@ num2words, protobuf, pytestCheckHook, + pythonOlder, pyyaml, - setuptools, setuptools-scm, + setuptools, strictyaml, termcolor, ufo2ft, @@ -18,17 +19,29 @@ buildPythonPackage rec { pname = "shaperglot"; - version = "0.5.0"; + version = "0.6.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { owner = "googlefonts"; repo = "shaperglot"; rev = "refs/tags/v${version}"; - hash = "sha256-jmYB1tsMMpFs0X/FW3z9el2nFr8De2jR1dO658w7U4Q="; + hash = "sha256-O6z7TJpC54QkqX5/G1HKSvaDYty7B9BnCQ4FpsLsEMs="; }; - pyproject = true; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=75.0.0" "setuptools" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ gflanguages @@ -41,19 +54,17 @@ buildPythonPackage rec { vharfbuzz youseedee ]; - build-system = [ - setuptools - setuptools-scm - ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "shaperglot" ]; + meta = with lib; { description = "Tool to test OpenType fonts for language support"; - mainProgram = "shaperglot"; homepage = "https://github.com/googlefonts/shaperglot"; + changelog = "https://github.com/googlefonts/shaperglot/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; + mainProgram = "shaperglot"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sismic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sismic/default.nix index 8128e5490d..0a6cd34b38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sismic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sismic/default.nix @@ -11,7 +11,7 @@ }: let - version = "1.6.6"; + version = "1.6.7"; in buildPythonPackage { pname = "sismic"; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "AlexandreDecan"; repo = "sismic"; rev = "refs/tags/${version}"; - hash = "sha256-MvJyyERH0l5547cVmpxnHXRf9q1ylK9/ZfyLYBQfsbY="; + hash = "sha256-EP78Wc2f6AKqbGBW8wVP0wogEbTo0ndjlRRd+fsUvCo="; }; pythonRelaxDeps = [ "behave" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix index f88d43362d..e1a87118ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "smbus2"; - version = "0.4.3"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tjJurJzDn0ATiYY3Xo66lwUs98/7ZLG3d4+h1prVHAI="; + hash = "sha256-3ZAjviVLO/c27NzrPcWf6RlZYclYkmUmOskTP9TVbNM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smoke-zephyr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smoke-zephyr/default.nix new file mode 100644 index 0000000000..0f85fae942 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/smoke-zephyr/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "smoke-zephyr"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "zeroSteiner"; + repo = "smoke-zephyr"; + rev = "refs/tags/v${version}"; + hash = "sha256-XZj8sxEWYv5z1x7LKb0T3L7MWSZbWr7lAIyjWekN+WY="; + }; + + postPatch = '' + substituteInPlace tests/utilities.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "smoke_zephyr" ]; + + meta = { + description = "Python utility collection"; + homepage = "https://github.com/zeroSteiner/smoke-zephyr"; + changelog = "https://github.com/zeroSteiner/smoke-zephyr/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solarlog-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solarlog-cli/default.nix index ef88f6db93..b82b69d8c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solarlog-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solarlog-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solarlog-cli"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "solarlog_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-67ZEval+cRvjFhQynFVYf5FFDw+zWrAfSC/2d6X+oh4="; + hash = "sha256-Oa2o4fuchW3ROtQFVhiWL6rhdUbzSFDegCkm8W7bCpE="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sotabenchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sotabenchapi/default.nix new file mode 100644 index 0000000000..b8a1b0b918 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sotabenchapi/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + click, + requests, + tabulate, +}: + +let + version = "0.0.16"; + pname = "sotabenchapi"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-thbVH4aLmEgi8K17PkmbUg4nHqGj+dEiXPDILjvQMzk="; + }; + + # requirements.txt is missing in the Pypi archive and this makes the setup.py script fails + postPatch = '' + touch requirements.txt + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + click + requests + tabulate + ]; + + pythonImportsCheck = [ + "sotabenchapi" + ]; + + # No tests + doCheck = false; + + meta = { + description = "Easily benchmark Machine Learning models on selected tasks and datasets"; + homepage = "https://pypi.org/project/sotabenchapi/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix index 8629af8a07..ee20791679 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix @@ -2,10 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - numpy, + flac, + openai, + openai-whisper, + pocketsphinx, + pyaudio, pytestCheckHook, pythonOlder, - torch, requests, setuptools, soundfile, @@ -26,29 +29,41 @@ buildPythonPackage rec { hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4="; }; + postPatch = '' + # Remove Bundled binaries + rm speech_recognition/flac-* + rm -r third-party + + substituteInPlace speech_recognition/audio.py \ + --replace-fail 'shutil_which("flac")' '"${lib.getExe flac}"' + ''; + build-system = [ setuptools ]; dependencies = [ + pyaudio requests typing-extensions ]; + optional-dependencies = { + whisper-api = [ openai ]; + whisper-local = [ + openai-whisper + soundfile + ]; + }; + nativeCheckInputs = [ - numpy pytestCheckHook - torch - soundfile - ]; + pocketsphinx + ] ++ optional-dependencies.whisper-local ++ optional-dependencies.whisper-api; pythonImportsCheck = [ "speech_recognition" ]; disabledTests = [ - # Test files are missing in source - "test_flac" - # Attribute error - "test_whisper" - # PocketSphinx is not available in Nixpkgs - "test_sphinx" + # Parsed string does not match expected + "test_sphinx_keywords" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix index f938f267eb..85c30a91a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,6 +10,7 @@ docutils, mistune, pygments, + sphinx, # tests pytestCheckHook, @@ -17,13 +18,13 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.6.1"; + version = "0.6.2"; format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-7OPYEuLVWbTn5H9ntqh7Dipom2svURR5XI7Uf/s5wWk="; + hash = "sha256-RHRi6Cy4vmFASiIEIn+SB2nrkj0vV2COMyXzu4goa0w="; }; nativeBuildInputs = [ flit-core ]; @@ -32,12 +33,12 @@ buildPythonPackage rec { docutils mistune pygments + sphinx ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - broken = true; # https://github.com/omnilib/sphinx-mdinclude/issues/22 homepage = "https://github.com/omnilib/sphinx-mdinclude"; changelog = "https://github.com/omnilib/sphinx-mdinclude/blob/v${version}/CHANGELOG.md"; description = "Sphinx extension for including or writing pages in Markdown format"; @@ -50,6 +51,9 @@ buildPythonPackage rec { sphinx-mdinclude is a fork of m2r and m2r2, focused only on providing a Sphinx extension. ''; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ + flokli + JulianFP + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix index f774c81ed8..80a6398960 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-petG4uqySkrThs77zp6pl6bdP0Zeea5QEngDhbqdx6Y="; + hash = "sha256-SWI2lXJ+JeoYsVaripSuL9pz5m9nRj+1986s3cEgVjE="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/submitit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/submitit/default.nix new file mode 100644 index 0000000000..eb39da57d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/submitit/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cloudpickle, + flit-core, + typing-extensions, + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "submitit"; + version = "1.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = "submitit"; + rev = "refs/tags/${version}"; + hash = "sha256-PDQLzqQjoBAZM9FKsoRby26Pbh4nik3SltIHUw/xWcY="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + cloudpickle + flit-core + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "submitit" + ]; + + disabledTests = [ + # These tests are broken + "test_snapshot" + "test_snapshot_excludes" + "test_job_use_snapshot_cwd" + "test_job_use_snapshot_modules" + "test_nested_pickling" + "test_setup" + "test_requeuing" + ]; + + meta = { + changelog = "https://github.com/facebookincubator/submitit/releases/tag/${version}"; + description = "Python 3.8+ toolbox for submitting jobs to Slurm"; + homepage = "https://github.com/facebookincubator/submitit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix index f0ff72b8b7..2e264d7756 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "survey"; - version = "5.4.0"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JT0tcNBReNdfbZrwSgv0OFcBz9Hp1N5JF4nP9oXfTJs="; + hash = "sha256-4vnjtSbw2y/o+fSWDl/CqTEZkl0jULGOLURdZ0BpKvY="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix index 0299d511c2..f923942c99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.9.3"; + version = "2.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "chezou"; repo = "tabula-py"; rev = "refs/tags/v${version}"; - hash = "sha256-dEcVIlK3M7zqRMN7W7mnnMPWhM2A4/qvf0aY61ko4yE="; + hash = "sha256-PQbwm9ho3XtpmZ7N7ASkrV8gk9Jom+yQKlt2fUa948s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix index fcae826816..63ed58fca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix @@ -19,6 +19,7 @@ paramiko, pbr, prettytable, + pynacl, python, pythonOlder, pyyaml, @@ -74,6 +75,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hacking oslotest + pynacl stestr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index be500fff02..0631b8fc6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1251"; + version = "3.0.1253"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-zLC0jpxRrdsZ9vP8x0ayqMcPE197jwCIL2OrJjS2Wuk="; + hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch-geometric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch-geometric/default.nix index ed3bbdc735..80286ff1a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch-geometric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch-geometric/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -153,21 +154,27 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - disabledTests = [ - # TODO: try to re-enable when triton will have been updated to 3.0 - # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: - # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' - "test_compile_hetero_conv_graph_breaks" - "test_compile_multi_aggr_sage_conv" + disabledTests = + [ + # TODO: try to re-enable when triton will have been updated to 3.0 + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' + "test_compile_hetero_conv_graph_breaks" + "test_compile_multi_aggr_sage_conv" - # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. - # PyTorch built with MKL has better support for addmm with sparse CPU tensors. - "test_asap" - "test_graph_unet" + # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. + # PyTorch built with MKL has better support for addmm with sparse CPU tensors. + "test_asap" + "test_graph_unet" - # AttributeError: type object 'Any' has no attribute '_name' - "test_type_repr" - ]; + # AttributeError: type object 'Any' has no attribute '_name' + "test_type_repr" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This test uses `torch.jit` which might not be working on darwin: + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_traceable_my_conv_with_self_loops" + ]; meta = { description = "Graph Neural Network Library for PyTorch"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch b/third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch deleted file mode 100644 index e30f6449c7..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c5d4087519eae6f41c80bbd8ffbcc9390db44c7f Mon Sep 17 00:00:00 2001 -From: SomeoneSerge -Date: Thu, 10 Oct 2024 19:19:18 +0000 -Subject: [PATCH] cmake.py: propagate cmakeFlags from environment - ---- - tools/setup_helpers/cmake.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 4b605fe5975..ea1d6a1ef46 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -332,6 +332,12 @@ class CMake: - file=sys.stderr, - ) - print(e, file=sys.stderr) -+ -+ # Nixpkgs compat: -+ if "cmakeFlags" in os.environ: -+ import shlex -+ args.extend(shlex.split(os.environ["cmakeFlags"])) -+ - # According to the CMake manual, we should pass the arguments first, - # and put the directory as the last element. Otherwise, these flags - # may not be passed correctly. --- -2.46.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix index bcd5008984..e5231fb746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix @@ -35,7 +35,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.4.1"; + version = "2.5.0"; in buildPythonPackage { inherit version; @@ -45,7 +45,7 @@ buildPythonPackage { format = "wheel"; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix index 1db23d136b..17416b2717 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "2.4.1" = { - x86_64-linux-38 = { - name = "torch-2.4.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-y09QL5ELR+HjZsz3sjHawpZ9LvtH1LjLM/xjtLxe7tg="; - }; + "2.5.0" = { x86_64-linux-39 = { - name = "torch-2.4.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-mYatNVXd//Vekl2CmPiytJEGp9xg+BGiB2pEX+RFjis="; + name = "torch-2.5.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-Z3RdahkVnJ436sN6HAicTZ9ZTNcsIV2mFN9A/OEw3Sc="; }; x86_64-linux-310 = { - name = "torch-2.4.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-ml8LEDz+hAs1aEFqpQZ/bnuf7GfZxWWf1DsSB0UP6XU="; + name = "torch-2.5.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-uLcj9Hqgb9/rGnqsXf+PpZlL+qT9PK0GAbvw1bHBUEk="; }; x86_64-linux-311 = { - name = "torch-2.4.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-kU0Sjlq8u+ecobnrUxGxhURPGy1xF99VX+QYSH7PuJQ="; + name = "torch-2.5.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-Xj9Ke6gSUXwsFlmFe1GV8oeiiPvQUKWr+TEeA9vhoos="; }; x86_64-linux-312 = { - name = "torch-2.4.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-q0kWELFVUeCNp0urKdCTPmvxC6tE+31LEyjx6EXAWlM="; - }; - aarch64-darwin-38 = { - name = "torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-X8HU1+0mXvhTV5yvJyaG0e2Hzr3NBPKkmPgA/8U9q3E="; + name = "torch-2.5.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-EcKB2WiMNu3tBq6PYNa5fgEIMe+upKSyJErUNn4jLtc="; }; aarch64-darwin-39 = { - name = "torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-o43igD7mBQMJqsAyZ2U2w9O2qYBCSFN+OOCY0OFIF+w="; + name = "torch-2.5.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-7YScLRFY+FkflMFEeO4cPeq8H0OKAD1VwFdGJMAWJ/E="; }; aarch64-darwin-310 = { - name = "torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-02qO8QD1v/Ppw86pNLng1+onfLghDHFS00qabFgw6t0="; + name = "torch-2.5.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-uK9pC351HUG9Je8uqkauNUqngTgOHk006wMb+oP0tRI="; }; aarch64-darwin-311 = { - name = "torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-3d29iwZudDk0pCALPVQmekbbAhBodtIc8x99p6lvmOo="; + name = "torch-2.5.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-2nchfs0y5UxiSXmVR+7aEF67qow8dFtZGlMg4rwkNYU="; }; aarch64-darwin-312 = { - name = "torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-crSE1bbOwac1vz+locSIPQF0hpjF6c/b60/6t8eYfg0="; - }; - aarch64-linux-38 = { - name = "torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-Vq0qdgt6eIJyWh7r9WV6u7O1FE6ya8tHtSBZNXRjxUg="; + name = "torch-2.5.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-w6vjoAPA1XgGUi9z1euXdmg2onTYCcnKPrPnXSSIvz4="; }; aarch64-linux-39 = { - name = "torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-FJUTLzD3Iq8aCRlQCIuuo4P+OZA9sGsg5pNv2ZQCgD4="; + name = "torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-5CMassS3SgvmnicQ4/kRAs55yuCeb7saYe9yRsUHA+Q="; }; aarch64-linux-310 = { - name = "torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-+iewSNMhmM2m6c/wv3aOhoPZh0OQO35dKx9QmN7R00M="; + name = "torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-UPz/n1ucUQL5+PXLPRK9TZ8SZmUOS4wU9QpexYnh7qU="; }; aarch64-linux-311 = { - name = "torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-ML4oRNDJORYaEQc7+69kXxx8tD9i9GzG5N8cEZ+yp5g="; + name = "torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-IFoOy/hfTHhXz99Paw4HMWvZKe2SSCVp6PRSRABVmIQ="; }; aarch64-linux-312 = { - name = "torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-NhCUMrEL1xY8mzDOiW88LMobhrl2X5VqFZTw/0MJHio="; + name = "torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-V+B/GKTe9Sz+UETKqGG8PeRJcXn67iNvO5V7Qn/80OQ="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index 36863da675..cd43c04d67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -38,7 +38,7 @@ darwin, numactl, - # Propagated build inputs + # dependencies astunparse, fsspec, filelock, @@ -87,8 +87,6 @@ tensorboard, protobuf, - pythonOlder, - # ROCm dependencies rocmSupport ? config.rocmSupport, rocmPackages_5, @@ -225,11 +223,9 @@ in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.4.1"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.8.0"; - outputs = [ "out" # output standard python package "dev" # output libtorch headers @@ -243,17 +239,11 @@ buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-x/zM/57syr46CP1TfGaefSjzvNm4jJbWFZGVGyzPMg8="; + hash = "sha256-z41VAN4l/6hyHsxNOnJORy5EQK93kSMkDHRVQrdxv7k="; }; patches = - [ - # Allow setting PYTHON_LIB_REL_PATH with an environment variable. - # https://github.com/pytorch/pytorch/pull/128419 - ./passthrough-python-lib-rel-path.patch - ./0001-cmake.py-propagate-cmakeFlags-from-environment.patch - ] - ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] + lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) @@ -537,6 +527,9 @@ buildPythonPackage rec { ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; + pythonRelaxDeps = [ + "sympy" + ]; dependencies = [ astunparse cffi diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch deleted file mode 100644 index 629a0495c0..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 5481ce46031c..d50d9d547399 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -231,6 +231,7 @@ def generate( - "SELECTED_OP_LIST", - "TORCH_CUDA_ARCH_LIST", - "TRACING_BASED", -+ "PYTHON_LIB_REL_PATH", - ) - } - ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh index 88cbfa2c34..712edbddb5 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh @@ -5,23 +5,20 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" @@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix index d9aa2b6de3..f03dd8e460 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.1"; + version = "2.5.0"; format = "wheel"; src = @@ -33,7 +33,7 @@ buildPythonPackage rec { in fetchurl srcs; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix index ea62ccc724..ec859738d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "2.4.1" = { - x86_64-linux-38 = { - name = "torchaudio-2.4.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-/PvxFpkpX2WwRYHNBDcv4CojmAbrfSXaJ0bzXeD10tk="; - }; + "2.5.0" = { x86_64-linux-39 = { - name = "torchaudio-2.4.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-cbuwbBAYeZ2zoLzAlN0IuAvCi7e18nq4sOLziwFLEcY="; + name = "torchaudio-2.5.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-EPFw0hJ5l68BebIfOHjJiR54Sx5VtWNsHRnfq1tSYlU="; }; x86_64-linux-310 = { - name = "torchaudio-2.4.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-2oyHyAocE3akjcM+7zCwO73x3yWgW9KxxiC4gRx7Gb4="; + name = "torchaudio-2.5.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-PV0jpAEMHbJGhC+ahhHNK4teEQ1dR3jME9pZfvfDqV8="; }; x86_64-linux-311 = { - name = "torchaudio-2.4.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-AbBO25E1p9YPoBAPwB/7QKCFgBD1ma5kGPQOCeiOaBs="; + name = "torchaudio-2.5.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-Y+Qe6UgenV9ViG2tBHPsTuIhKl5Ruc1lU/2dWKYvZ+E="; }; x86_64-linux-312 = { - name = "torchaudio-2.4.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-a3TXBquoHbX4OMpBTwPT9lmOqIC3IQYGXbycXTwGP+E="; - }; - aarch64-darwin-38 = { - name = "torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-TqD9ABQv55XHW8wgowOYG1byMnx/fTIbQqj+8deKr6k="; + name = "torchaudio-2.5.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-qSgxhlE7+HATg8a8w+1tYk2kK7/WLzHHJrmulH9R7zc="; }; aarch64-darwin-39 = { - name = "torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-OtzlUIUJArmqbNI3jM1yCsnsjPMeLrqXQ8zIT/y+dtY="; + name = "torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-hVc/ZtwJSX0oK79Abo8rA+WSnrO9wfdqnZvEZkTUB7E="; }; aarch64-darwin-310 = { - name = "torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-ZhkJdRkJNAsk9jdBDf7AKoiIZ4FsPbGe1PQQKuEFJEo="; + name = "torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-q2m9/rRDQVnhaKSiwWGNHWWloUqR0X0hJW6pYPM0Bf0="; }; aarch64-darwin-311 = { - name = "torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-YK8VMYFdImWeVBLqQBvtVSoWw4mTjElmTkRuTP1d3AY="; + name = "torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-mC7ASUonx/Pn5oyRzJLm4a1vhv7e7sYnCWBRMJYysUk="; }; aarch64-darwin-312 = { - name = "torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-lTlGz2EP/Ve7P90ijv+iES+lHF3+NqlmEe/8kHSj074="; - }; - aarch64-linux-38 = { - name = "torchaudio-2.4.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-dNGc+co9rTlK/Ku35vftmrn1nyVA1QKCbH7D4zmFJR0="; + name = "torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-yDXadxcBsG++jhnOZD1eWH/TheX02PFAVRzgSQCxuWs="; }; aarch64-linux-39 = { - name = "torchaudio-2.4.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-NsfnvGs1jL9Ct2nIAgZ4D6FJfRQamFxrPndo3kRSTpo="; + name = "torchaudio-2.5.0-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-qr+MTOkZwuJKzklkHqQpNgAYgWNxo9RwQn/AKrERVsU="; }; aarch64-linux-310 = { - name = "torchaudio-2.4.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-VEMRedmpzPP+6umKrOB9ifrp/XKOK8hlbvvXDn7cxvg="; + name = "torchaudio-2.5.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-nf7tzvPkMBDz7C2ATI9i/kmrCe8cGeZzYyWTlmGik70="; }; aarch64-linux-311 = { - name = "torchaudio-2.4.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-dkCq/7IFbhLykGGHsDoiIooJCMh9ApX930sLkjNKKQs="; + name = "torchaudio-2.5.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-w1IB79KCRBUtbtvekndcEPOfWl2TRiAvB7FVTceNJaI="; }; aarch64-linux-312 = { - name = "torchaudio-2.4.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-W2L8exbtcIsMB9Q5MTd5fpL2P8O9VwVgfZe6app88/A="; + name = "torchaudio-2.5.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-WTJY8z3h+hbr5XGMlxfa82lUYNSKAYgZSlxXSnEIOMs="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix index 63ea30a39f..4b11fe0dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix @@ -76,14 +76,14 @@ let in buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-zQqIIzOW9vboP5XQSOUWB0edz6XJvz06RqbcYPO9K24="; + hash = "sha256-Swh+HnkGRzjQFt9mYO+qBq4BDTbmLGSkOrN2ZUQdNUI="; }; patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh index e4a9b9c90f..64b5011773 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,23 +5,20 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" @@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name")) + hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) echo " $key = {" >>$hashfile echo " name = \"$name\";" >>$hashfile diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchbench/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchbench/default.nix new file mode 100644 index 0000000000..3593ae7921 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchbench/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + numpy, + opencv4, + sotabenchapi, + torch, + torchvision, + tqdm, +}: + +let + version = "0.0.31"; + pname = "torchbench"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EBZzcnRT50KREIOPrr/OZTJ4639ZUEejcelh3QSBcZ8="; + }; + + # requirements.txt is missing in the Pypi archive and this makes the setup.py script fails + postPatch = '' + touch requirements.txt + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + opencv4 + sotabenchapi + torch + torchvision + tqdm + ]; + + pythonImportsCheck = [ + "torchbench" + ]; + + # No tests + doCheck = false; + + meta = { + description = "Easily benchmark machine learning models in PyTorch"; + homepage = "https://github.com/paperswithcode/torchbench"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index ea03954c14..e2f0ea2bed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.19.1"; + version = "0.20.0"; in buildPythonPackage { inherit version; @@ -34,7 +34,7 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix index 43ab9f1790..1ca7c229c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "0.19.1" = { - x86_64-linux-38 = { - name = "torchvision-0.19.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-MFL5ci3Dn9fwJrRKb73vk6so95UgBwEs6E0xPWeWQBE="; - }; + "0.20.0" = { x86_64-linux-39 = { - name = "torchvision-0.19.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-FFMN7gzEx8BgJPC9zJV/d94NK5DptyIZ3NYh+ilSXQA="; + name = "torchvision-0.20.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-UP9Puz3JlN21FK7WvZLJDMF1sWjGWYg4014qxTqaCos="; }; x86_64-linux-310 = { - name = "torchvision-0.19.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-uMxL84G3VSKZW2AeB6G0M7X9kl3D40p/ps0i9EnWU3k="; + name = "torchvision-0.20.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-k5Ni8WH31mqPKrExODqzeZhFjjCO4sYsnRzSdR37KEI="; }; x86_64-linux-311 = { - name = "torchvision-0.19.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-U2QXNAaUspzFTDCFB9CYsAy9zB/oaAcqNLVTvtc9nTA="; + name = "torchvision-0.20.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-O0R4ODFuAqqSFSklZbp5wT0//rBjGgkAxby4uB7iJtc="; }; x86_64-linux-312 = { - name = "torchvision-0.19.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-+wzQYi40nfhK1zutjrvqaxx08DPa3YTZqAz0opGSfq4="; - }; - aarch64-darwin-38 = { - name = "torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-TE5PWyTqawh7Au1JKrHiG7ozUsRXfi3vFCSM/GBzIzg="; + name = "torchvision-0.20.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-hGajClfLUfO0GtC+QKxc8/GijZMnMKHEEWyD0yHQfjw="; }; aarch64-darwin-39 = { - name = "torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-cx9DTZFYZ2niVbXXDtGkRX4KE5SpX0qs8OHn4h+AwJg="; + name = "torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-anDIHqUGjdex40Dr6rtlNkV22LmBlFTP34EikM8D5Fo="; }; aarch64-darwin-310 = { - name = "torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-VOhRMJnm9YY1bHD4CdNPORr3GtGC/gccwyiiivLEBgg="; + name = "torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-8WTVRZZRhv/WYBTjSpZnBtEshBmDAt1GdIyuRZhGCaQ="; }; aarch64-darwin-311 = { - name = "torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-QFFCgrSJbWJ2W44m1wkcMuF8NYF9AOxL4jYuo7o9F4c="; + name = "torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-oV3mJmo2vNENifbz17pOLdVnp6Ct1hbrxuZa6iB5Dl0="; }; aarch64-darwin-312 = { - name = "torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-J+zid/8PbNx/7QYnJ5xjLcsuWBh9p3HsoksPvPP4WQ0="; - }; - aarch64-linux-38 = { - name = "torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-TRC8kIPE1frdft17cpcAp75I2rT2InjfO8c/pI5IoVU="; + name = "torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-rA7bpTT7BxsrA6L9XLv5t8JZiW0XodDYMLPFt9+uB4I="; }; aarch64-linux-39 = { - name = "torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-4ygwm4ZwouiJsv52ocJ0SgmcEcmE2pqCI1e9nevWmaU="; + name = "torchvision-0.20.0-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-jWzqirC/cuy3GwfND+g26s9aX6mPZinSJhIS6Ql3uWM="; }; aarch64-linux-310 = { - name = "torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-ewYxFhZL5S/G3rR2Lef4yQv6OmX41crxf44tWq3HWgQ="; + name = "torchvision-0.20.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-4IT1Dsvb56nML8UeoDZ641/eRuhKlkv0BGyxx/634+Y="; }; aarch64-linux-311 = { - name = "torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-1xpqb+OlKByjSH1MVq1KrSD/cPgvHXx5vLbnsMKvAMg="; + name = "torchvision-0.20.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-Vdf0PvkS68TaS7pzoLvzh9OKa+nNUhZ5wPQFb5Vktpg="; }; aarch64-linux-312 = { - name = "torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-wHv0PCoUXXkuzZ0FA9bHNXcUfs5QjUVgDYqsd+TN/Pk="; + name = "torchvision-0.20.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-+NAhNIms+xODafJFWmiTiAwZSoGV44HBn4crJ38mVMM="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index e00846c824..06aa3932f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -26,7 +26,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.19.1"; + version = "0.20.0"; in buildPythonPackage { inherit pname version; @@ -35,7 +35,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-UMBFR/Vw13A+bBfr0p3rRwpCRVMq+ihdlG3C/iuOC30="; + hash = "sha256-aQ1HhWtkhA2EYPCV2vEW10kcP0m0TLNsgjA0Yiwpm9U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh index 47ccbd935c..4e5acf3a7a 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,22 +5,19 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-linux-38 $darwin_bucket/torchvision-${version}-cp38-cp38-linux_aarch64.whl torchvision-${version}-cp38-cp38-linux_aarch64.whl" "aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-linux_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl" "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-linux_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-linux_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" @@ -36,7 +33,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index b6092e2138..730156a527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.5.0"; + version = "4.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/EnZ+8KeJQF3daAk5d+A9iXJ3dv5gs4+pdNEUHCVBCU="; + hash = "sha256-LoUXn9vuHocqoA1CpbKGBaBTApaIV6gyGk36Q5ByWxw="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix index 6bb67753a8..98c8da68a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "triton"; - version = "2.1.0"; + version = "3.1.0"; format = "wheel"; src = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/triton/binary-hashes.nix index 5c542ac187..0ce7ee85b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/binary-hashes.nix @@ -7,26 +7,31 @@ version: builtins.getAttr version { - "2.1.0" = { + "3.1.0" = { x86_64-linux-38 = { - name = "triton-2.1.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-Ofb7a9zLPpjzFS4/vqck8a6ufXSUErux+pxEHUdOuiY="; + name = "triton-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-ba2sp/wk3jThgCcbXPhkwWdVcC6fY6FvYt9xSoCZEmo="; }; x86_64-linux-39 = { - name = "triton-2.1.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-IVROUiwCAFpibIrWPTm9/y8x1BBpWSkZ7ygelk7SZEY="; + name = "triton-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl "; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-qvqaIM0Nn+5SPNRQSqcTGAeoZM133Pbv5+mB8YuMbBE="; }; x86_64-linux-310 = { - name = "triton-2.1.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-ZkOZI6MNXUg5mwip6uEDcPbCYaXshkpkmDuuYxUtOdc="; + name = "triton-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl "; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-aw3RCpJSY6u+n6N9zeZ6Xpsjg/wmn99Z9WV8rDjF0dg="; }; x86_64-linux-311 = { - name = "triton-2.1.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-kZsGRT8AM+pSwT6veDPeDlfbMXjSPU4E+fxxxPLDK/g="; + name = "triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-DzT254hdG/Dqr3uodaXwzm88E7qY+VA2UcHm3GdX7Vw="; + }; + x86_64-linux-312 = { + name = "triton-3.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-yBgvQv2AgKfTnWZoFPo2xeMMwA6n7usaKYPbtMmaD9w="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 6340a655cf..894fb118e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.3"; + version = "9.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-Yb5eeg8m21gjx9ZS7Z/N46p7LGfIBCdrmGoHpD+B+as="; + hash = "sha256-74tJt3BfSKfsl0A1gz7XVzlvumQ8H++Nfp+SEknMYcY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 6bdcf999be..17cc87e26b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240907"; + version = "4.12.0.20241020"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jQI7hlMJIgcEF6HUxNkWeKsP8kObOyss/6O2KLSeurE="; + hash = "sha256-FYNw0I0M1Ei9EbEypQ/1J5I3pdS1g3vroHTeFSpRMFk="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix index 2bd3c889d8..e7916e6321 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20240806"; + version = "1.1.11.20241018"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gGDcmLr2PWeWp2W7vICf/596OD9uOprdUm+BTAhlRe8="; + hash = "sha256-mAQlVf942eOlHHfJGLEEGsu362xAVAjYqeFQ/1vsyvo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix index 89eac63a4a..6f313206c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "wxpython"; - version = "4.2.1"; + version = "4.2.2"; format = "other"; src = fetchPypi { pname = "wxPython"; inherit version; - hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw="; + hash = "sha256-XbywZQ9n/cLFlleVolX/qj17CfsUmqjaLQ2apE444ro="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdg-base-dirs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdg-base-dirs/default.nix index e65785377a..fa8aa9860d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdg-base-dirs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdg-base-dirs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xdg-base-dirs"; - version = "6.0.1"; + version = "6.0.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = "xdg-base-dirs"; - rev = version; - hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk="; + rev = "refs/tags/${version}"; + hash = "sha256-iXK9WURTfmpl5vd7RsT0ptwfrb5UQQFqMMCu3+vL+EY="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index a053c53139..1be46ecf56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,13 +1,14 @@ { lib, - bleak, bleak-retry-connector, + bleak, bluetooth-data-tools, bluetooth-sensor-state-data, buildPythonPackage, cryptography, fetchFromGitHub, home-assistant-bluetooth, + orjson, poetry-core, pycryptodomex, pytestCheckHook, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-dZJsB40BMPo0tOFq0vLILrwfezf5dnspFK/aZWOV4uc="; + hash = "sha256-7/4Ea8IiRPxhgMiazSylYZAmznqIula2yCEUAyIHBBg="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { bluetooth-sensor-state-data cryptography home-assistant-bluetooth + orjson pycryptodomex sensor-state-data ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ydata-profiling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ydata-profiling/default.nix index d9e8887577..74be2546c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ydata-profiling/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.10.0"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "ydataai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uB8E7qp1xohAdcIIt1T2DxwSu93XhJoI8/qn54fSvGY="; + hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/development/tools/air/default.nix index f50100bf6c..9fd6331971 100644 --- a/third_party/nixpkgs/pkgs/development/tools/air/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/air/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "air"; - version = "1.52.3"; + version = "1.61.1"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; rev = "v${version}"; - hash = "sha256-TLTg9fYkIlTFDwkjRIQ7mAmKd+jA5Q9EPQ62fJ6zS9o="; + hash = "sha256-IwPUbz3JYKz0TeK/kbEUzqFp0l8u/AFu9KEAyR8zlSQ="; }; - vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; + vendorHash = "sha256-BY2KnAwlrIyqSHWFLD0QU93EXAv4ta/ibvYWiHXvYMc="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix index 2db5d88013..9fc8d9bc28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.30.0"; + version = "2.31.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-jYdinK7it2MDwrWZmxPHR5YqZhhVIo2vMZDCX38+igU="; + hash = "sha256-rhuIf+lwxw55SscOmtCsbrcIdjpTTM9joQbMbx8G0Uw="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index c6f5739a35..ae2a7d30b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.3.6"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms="; + sha256 = "sha256-q3AkqhE0hD6+cCv5UeZ4uyUi6Adrmxv4jMGYN7Keias="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 49557a4a1c..af7420b7f4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.267"; + version = "3.2.269"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-9xAWk5RFpm4sD77exdc3kjXyvW0OR/2gv2Ox+lAONoA="; + hash = "sha256-bpXKSyuPhKby8pCQUrH6H9H5za5R8FsKnoqsm8P4zek="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 95bcbf055b..6bf80144a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "radare2"; - version = "5.9.2"; + version = "5.9.6"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-smsjGfTvSTVwd7nhWhptYpkus2fEQ2EVdT5bDt/rHZE="; + hash = "sha256-t/BMsYqNLMAlBBYm6JCDkFYL5YwJBwmEaaIY4KFYxY4="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch new file mode 100644 index 0000000000..4a10f44612 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch @@ -0,0 +1,36 @@ +diff --git a/meson.build b/meson.build +index a8153a2ee5..787cbfae06 100644 +--- a/meson.build ++++ b/meson.build +@@ -197,7 +197,7 @@ endif + + # Handle PCRE2 + cpu_jit_supported = [ 'aarch64', 'arm', 'mips', 'mips64', 'ppc', 'ppc64', 'riscv32', 'riscv64', 's390x', 'x86', 'x86_64' ] +-pcre2_jit_supported = target_machine.cpu_family() in cpu_jit_supported and cc.get_id() != 'tcc' and target_machine.system() != 'darwin' ++pcre2_jit_supported = false + if pcre2_jit_supported + add_project_arguments(['-DSUPPORTS_PCRE2_JIT'], language: 'c') + endif +diff --git a/subprojects/packagefiles/pcre2/meson.build b/subprojects/packagefiles/pcre2/meson.build +index b40ea85740..f3ee7a02ed 100644 +--- a/subprojects/packagefiles/pcre2/meson.build ++++ b/subprojects/packagefiles/pcre2/meson.build +@@ -60,18 +60,6 @@ cpu_jit_supported = [ 'aarch64', 'arm', 'mips', 'mips64', 'ppc', 'ppc64', 'riscv + # tcc doesn't support the MSVC asm syntax PCRE2 uses (`__asm { ... }`). + # Darwin kernel not as well, because of forbidden wx memory. + # It is used in the JIT compiler code. +-if cc.get_id() != 'tcc' and target_machine.cpu_family() in cpu_jit_supported and target_machine.system() != 'darwin' +- libpcre2_c_args += ['-DSUPPORT_JIT'] +- pcre2_files += ['src/pcre2_jit_compile.c'] +-endif +- +-if target_machine.system() == 'openbsd' +- # jit compilation fails with "no more memory" if wx allocations are allowed. +- libpcre2_c_args += ['-DSLJIT_WX_EXECUTABLE_ALLOCATOR'] +-elif target_machine.system() == 'netbsd' +- # jit compilation fails with "no more memory" if wx allocations are allowed. +- libpcre2_c_args += ['-DSLJIT_PROT_EXECUTABLE_ALLOCATOR'] +-endif + + pcre2_includes = [ + include_directories('.'), diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index 6336d603a6..893242aa4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -60,6 +60,8 @@ let rizin = stdenv.mkDerivation rec { ./librz-wrapper-support.patch ./0001-fix-compilation-with-clang.patch + # Can be dropped when upstream fixes this: https://github.com/NixOS/nixpkgs/issues/300056 + ./0002-disable-pcre2-jit.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index d9a851d098..f29d54a9ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-sgAr4kUBjKIH+DgI5XqH/Zs3uL0yiYwlBa6vO0m++xM="; + hash = "sha256-osQhLnOuJQqyKm24mgaEuYKy69cPvnR3XHU0JgVKA84="; }; - vendorHash = "sha256-B2QFjJKwfQYZP8ypiv7bNkFNr3ejP42WA/bmv4Jz46c="; + vendorHash = "sha256-mhc8HJG+sI8pZG/D+91+pyi0RGK0WfZV6ZNuH1bUfhk="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch deleted file mode 100644 index 99d64f26d0..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/test/lit.cfg b/test/lit.cfg -index 118c979..b69fecc 100644 ---- a/test/lit.cfg -+++ b/test/lit.cfg -@@ -207,13 +207,8 @@ def is_preload_disabled(): - if is_windows: - return True - elif sys.platform == 'darwin': -- command = ['csrutil', 'status'] -- pattern = re.compile(r'System Integrity Protection status:\s+enabled') -- try: -- output = subprocess.check_output(command, stderr=subprocess.STDOUT) -- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) -- except (OSError, subprocess.CalledProcessError): -- return False -+ # csrutil(8) isn't available in the Nix build sandbox. -+ return True - else: - return False - -@@ -221,6 +216,11 @@ def is_preload_disabled(): - if not is_preload_disabled(): - config.available_features.add('preload') - -+# Preserve the variables required for the Nix toolchain wrappers. -+for var, value in os.environ.items(): -+ if var.startswith('NIX_'): -+ config.environment[var] = value -+ - print(config.substitutions) - print(config.environment) - print(config.available_features) diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix index 4299c12210..49532070b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix @@ -79,7 +79,6 @@ mkCombyPackage { ocamlPackages.patience_diff ocamlPackages.toml ocamlPackages.cohttp-lwt-unix - ocamlPackages.opium ocamlPackages.textutils ocamlPackages.jst-config ocamlPackages.parany diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix index daffa91651..ebf6b0fcea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -8,7 +8,6 @@ lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { python = python3.override { self = self.python; packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy_1_4; moto = super.moto.overridePythonAttrs (oldAttrs: { # a lot of tests -> very slow, we already build them when building python packages doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix index 904c5af636..915453cdcc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -26,6 +26,8 @@ , moto , markdown , lz4 +, brotli +, zstandard , setuptools-trial , buildbot-worker , buildbot-plugins @@ -71,7 +73,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "4.0.3"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -80,7 +82,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-4jxA8qvLX53cLooCpkn9hvcz4SFGc29TKxUah80Ufp4="; + hash = "sha256-RPg4eXqpm/F1SSoB4MVo61DgZv/iE2R4VtCkUU69iA8="; }; build-system = [ @@ -108,6 +110,9 @@ buildPythonApplication rec { importlib-resources packaging unidiff + treq + brotli + zstandard ] # tls ++ twisted.optional-dependencies.tls; @@ -137,26 +142,17 @@ buildPythonApplication rec { ]; postPatch = '' - substituteInPlace master/buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" - ''; - preBuild = '' cd master + touch buildbot/py.typed + substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; - # Silence the depreciation warning from SqlAlchemy - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" - - # remove testfile which is missing configuration file from sdist - rm buildbot/test/integration/test_graphql.py - # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776 - rm buildbot/test/integration/test_try_client.py ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 94564ce368..7da50409cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-wBwJXDR52jDRd+8efIjQ+ncWe708k1F21MuvBwhjEwc="; + hash = "sha256-+ZiOkTZLdwqsZfApW6aQxoNkbcFCaB4BHEjMTZIl+Rg="; }; # Remove unnecessary circular dependency on buildbot @@ -29,40 +29,13 @@ }; }; - www-react = buildPythonPackage rec { - pname = "buildbot_www_react"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-JJK1vmTdOImKIM1glrTjo2E0KnotU2QJVc2OIzVQQ1Y="; - }; - - # Remove unnecessary circular dependency on buildbot - postPatch = '' - sed -i "s/'buildbot'//" setup.py - ''; - - buildInputs = [ buildbot-pkg ]; - - # No tests - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot UI (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2Only; - }; - }; - console-view = buildPythonPackage rec { pname = "buildbot_console_view"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-kzj4IPNn/cUW7nidOLyO7AD98uXxWcqvMxaOhXhFn74="; + hash = "sha256-IgG/afjU//zrcHuTXMBLlz1gCmB31fWaECIm+UqaMgA="; }; buildInputs = [ buildbot-pkg ]; @@ -78,35 +51,13 @@ }; }; - react-console-view = buildPythonPackage rec { - pname = "buildbot_react_console_view"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-4quLblPknI/vrCNF7Frl5+UlY50vuspW0XmMJubvVXI="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot Console View Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - waterfall-view = buildPythonPackage rec { pname = "buildbot_waterfall_view"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-VC84rftiA7/x0X3lJfHTrEZve/ZDncVDuq6fisEI8nc="; + hash = "sha256-E0yFY3PtTZ8XtJGDMh0aRljhTNsWHqHQzcBORTgrCIA="; }; buildInputs = [ buildbot-pkg ]; @@ -122,35 +73,13 @@ }; }; - react-waterfall-view = buildPythonPackage rec { - pname = "buildbot_react_waterfall_view"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-2HZBnVvxPhU6rLmG6l9hX51zm8pvA5amsjExGx65+OQ="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot Waterfall View Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - grid-view = buildPythonPackage rec { pname = "buildbot_grid_view"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-IwTANqPNGon4lvT2ASpguEf8GcD1hz/7flNBml0NTdc="; + hash = "sha256-KR4M7RSULCM1aS7vYjWuMXIHGpO+xFjfhC8+YncAmlE="; }; buildInputs = [ buildbot-pkg ]; @@ -166,35 +95,13 @@ }; }; - react-grid-view = buildPythonPackage rec { - pname = "buildbot_react_grid_view"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-SQiaIcupEtNePr4LUzwYm3RRKT9xa7RnHUaiE8EaRzQ="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot Grid View Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - wsgi-dashboards = buildPythonPackage rec { pname = "buildbot_wsgi_dashboards"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-dzK4WvBRxWoAfhsdKoYUnsG97OKmM8Jgr4Uv7NPpiVk="; + hash = "sha256-L7DayDddqrwOyBwgy4w1waCL+49GMtdrCdZNpcLrFXk="; }; buildInputs = [ buildbot-pkg ]; @@ -210,35 +117,13 @@ }; }; - react-wsgi-dashboards = buildPythonPackage rec { - pname = "buildbot_react_wsgi_dashboards"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-vytU7WRdXWHazc/LYZSWlslkOb3lnTitEW3UZQ/VmTU="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot WSGI dashboards Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - badges = buildPythonPackage rec { pname = "buildbot_badges"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-O71qB9uIigYcK/t2t+481oktHjF5up1nk1dS4eEMb3A="; + hash = "sha256-CnRTSnwhSj6cjrATUuVerGrqt7XxJZYgC5XjUC4+Xrs="; }; buildInputs = [ buildbot-pkg ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/update.sh b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/update.sh index b1e407ef16..c5ea61e382 100755 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -4,13 +4,8 @@ set -eu -o pipefail nix-update buildbot nix-update --version=skip buildbot-plugins.www -nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view -nix-update --version=skip buildbot-plugins.react-console-view nix-update --version=skip buildbot-plugins.waterfall-view -nix-update --version=skip buildbot-plugins.react-waterfall-view nix-update --version=skip buildbot-plugins.grid-view -nix-update --version=skip buildbot-plugins.react-grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards -nix-update --version=skip buildbot-plugins.react-wsgi-dashboards nix-update --version=skip buildbot-plugins.badges diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 3abc101343..8bbe3a241b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -8,7 +8,6 @@ # propagates , autobahn -, future , msgpack , twisted @@ -27,6 +26,7 @@ buildPythonPackage ({ postPatch = '' cd worker + touch buildbot_worker/py.typed substituteInPlace buildbot_worker/scripts/logwatcher.py \ --replace /usr/bin/tail "${coreutils}/bin/tail" ''; @@ -37,7 +37,6 @@ buildPythonPackage ({ propagatedBuildInputs = [ autobahn - future msgpack twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index f59f783231..d8b40e0ca3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fidE4MSZS53Odv5tlNPFJEhcb8JTmILVRNmcVF9Z9Oc="; + sha256 = "sha256-lmsL73jck3vt6oDP699BrMq0RyrXAUuTjKtvHcNtcZc="; }; - vendorHash = "sha256-stxsMJPBUclLlmR88c7OwAhsw9dhyBIhStuxLVu00bo="; + vendorHash = "sha256-PZHMJpyZ2w3GFHQW56m+9POyXR6wMt3TmNaQENg9lWw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index c404bed341..a991bce5ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,13 +13,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.21.0"; + version = "5.21.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-X5aBrnyZ/tMykJFifyY1LeR/nShBlxm9HazVE0L7RJk="; + hash = "sha256-zVGnAFvxBRh7YGXET8YjDI+qXay6StgG618mRfpc4kw="; }; # Use system openssl. diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json index a51217873b..2ed339ff79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json @@ -67,13 +67,24 @@ }, "32": { "hashes": { - "aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc", - "aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c", - "armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d", - "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", - "x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab", - "x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" + "aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259", + "aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342", + "armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc", + "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm", + "x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907", + "x86_64-linux": "4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185" }, - "version": "32.1.2" + "version": "32.2.1" + }, + "33": { + "hashes": { + "aarch64-darwin": "75f3267e5517bb35cbfc11f2d5673947cfa8a510dc3a78c46356a948650027f2", + "aarch64-linux": "6c321b5f8f8fc694c09f6c904ad0a40a0eff1b84b2b771f6eae292e197e3a8c1", + "armv7l-linux": "d54e4820ab965acaa21940e15b79278fdbff4df083f162cd2a192541cf5a7063", + "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f", + "x86_64-darwin": "945a07cec9eb2bdfa6a7ae6971f1df564447a5eeea3d533abae3ef5eac1966a1", + "x86_64-linux": "497ff71b2cacfc0a001fcfd3d852fd758e20604622ddfa2932dc32074c48af66" + }, + "version": "33.0.0" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json index 3cb6b6a756..55e31c5b16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json @@ -34,13 +34,24 @@ }, "32": { "hashes": { - "aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046", - "aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828", - "armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e", - "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", - "x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc", - "x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" + "aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec", + "aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00", + "armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7", + "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm", + "x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b", + "x86_64-linux": "2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297" }, - "version": "32.1.2" + "version": "32.2.1" + }, + "33": { + "hashes": { + "aarch64-darwin": "c0717f7dc5a2e3f99688389e643e9dc2e513a948df537abadc24230e1c93a1a3", + "aarch64-linux": "32887c18a8acb0d36eba6e3d9d9f763dda9155f98a948958b446681b9da63ed3", + "armv7l-linux": "c52961bcc5d2764d8a144a4fc2b9c25e904c8345deec9253dcaca7d560508a56", + "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f", + "x86_64-darwin": "13086ff2417512f9c87982857e67f25ee05f55e3bb18b5d373264c153a50e166", + "x86_64-linux": "b07f166b53bdf64282e8ba73bf6a6bc86844dd38c183ee7ecbad5d281ee380ea" + }, + "version": "33.0.0" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/info.json index 3999b50e98..2cd3361e03 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/info.json @@ -1858,7 +1858,7 @@ "version": "31.6.0" }, "32": { - "chrome": "128.0.6613.162", + "chrome": "128.0.6613.186", "chromium": { "deps": { "gn": { @@ -1868,15 +1868,15 @@ "version": "2024-06-11" } }, - "version": "128.0.6613.162" + "version": "128.0.6613.186" }, "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-52pb9e5XYaiIpUlazoXbmEJ/3l4uPWt9sVmF0+cVBKQ=", + "hash": "sha256-6Rtd3eu9z7yvzmMaSGjvTCXt29f9cAXFc1IVT0otQ2I=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "128.0.6613.162", + "rev": "128.0.6613.186", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -1905,10 +1905,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=", + "hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=", "owner": "electron", "repo": "electron", - "rev": "v32.1.2" + "rev": "v32.2.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2080,14 +2080,14 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", - "rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", + "hash": "sha256-UTtU0GIlkOtXA3vJy0MA99wLARHl7WMM7IBNmXxE6d4=", + "rev": "a79093138c06b0ca942f99ddc39b225dafa4776d", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", - "rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", + "hash": "sha256-p4DZNVQ8C4YB52BfBKEFXCqenQk0ONkzkctM9vyz4aw=", + "rev": "ee5422d3f33c0bfd8643ce7782eb3a216cf15dea", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -2152,10 +2152,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", "owner": "nodejs", "repo": "node", - "rev": "v20.17.0" + "rev": "v20.18.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -2569,8 +2569,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", - "rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", + "hash": "sha256-vclLETDkiiBinfvse++0CF9/1+qZeG5vcukTTmqPYiU=", + "rev": "cd98397d0c2c3eb1d5a8d76aade3c87c2e0d28ac", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -2788,14 +2788,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=", - "rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a", + "hash": "sha256-VwRVnondH9YM8pYRQo0l0jM0Zb531kpQTo6ngvEPOBg=", + "rev": "d213b3bbc0ecf17ccd2849fdef3bccb1946b01b3", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", + "electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9", "modules": "128", - "node": "20.17.0", - "version": "32.1.2" + "node": "20.18.0", + "version": "32.2.1" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix index 14c783ce84..a5f325ebda 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fnlfmt"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromSourcehut { owner = "~technomancy"; - repo = pname; - rev = version; - sha256 = "sha256-rhbYG0TpqAZnbLaZOG739/pDA61Dwb4Y1HhBxWLtOus="; + repo = "fnlfmt"; + rev = "refs/tags/${version}"; + hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk="; }; nativeBuildInputs = [ luaPackages.fennel ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook preBuild echo "#!${lua}/bin/lua" > fnlfmt - ${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt + ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt chmod +x fnlfmt runHook postBuild diff --git a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index b35cc4998f..4a55908214 100644 --- a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }: +{ lib, stdenv, fetchFromGitHub, jdk11, maven, makeWrapper, jre_headless, pcsclite, proot, zlib }: let defineMvnWrapper = '' @@ -14,20 +14,20 @@ let in maven.buildMavenPackage rec { pname = "global-platform-pro"; - version = "20.01.23"; - GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty + version = "24.10.15"; + GPPRO_VERSION = "v24.10.15-0-gf2af9ef"; # git describe --tags --always --long --dirty src = fetchFromGitHub { owner = "martinpaljak"; repo = "GlobalPlatformPro"; rev = "v${version}"; - sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; + sha256 = "sha256-yy2WOLDetBrbNRf6HvvPdNPD51ujXomI2a2Hj6eVx1Q="; }; - mvnJdk = jdk8; - mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; + mvnJdk = jdk11; + mvnHash = "sha256-vTlOxFBjEZRD23ldMF+VRKZx6jyZ6YvgvZM353FWrWQ="; - nativeBuildInputs = [ jdk8 makeWrapper ]; + nativeBuildInputs = [ jdk11 makeWrapper ]; # Fix build error due to missing .git directory: # Failed to execute goal pl.project13.maven:git-commit-id-plugin:4.0.0:revision (retrieve-git-info) on project gppro: .git directory is not found! Please specify a valid [dotGitDirectory] in your pom.xml -> [Help 1] @@ -37,12 +37,20 @@ maven.buildMavenPackage rec { preConfigure = defineMvnWrapper; }; + postPatch = '' + git_properties_file="./library/target/classes/pro/javacard/gp/git.properties" + mkdir -p "$(dirname "$git_properties_file")" + # Suffix to differentiate from upstream builds. + distro_suffix=-nixpkgs + echo "git.commit.id.describe=''${GPPRO_VERSION}''${distro_suffix}" > "$git_properties_file" + ''; + preConfigure = defineMvnWrapper; installPhase = '' mkdir -p "$out/lib/java" "$out/share/java" cp tool/target/gp.jar "$out/share/java" - makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ + makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \ --add-flags "-jar '$out/share/java/gp.jar'" \ --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix index 25ceb20089..1903ff57ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-wS5m3dBiILxmVb6P559fGcONdCWc/5hhLAVMC+G1QZs="; + sha256 = "sha256-wqBT7uan5XL51HHDGINRH9NTb1tybF44d/rWRxl6Lak="; }; - vendorHash = "sha256-BxWmEcx5IIT/yI46CJGE0vE1BRm5zwngc0x1dVy/04s="; + vendorHash = "sha256-6L5LzXtYjrA/YKmNEC/9dyiHpY/8gkH/CvW0JTo+Bwc="; subPackages = [ "cmd/swag" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 984afa184a..1e465654ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -3,13 +3,11 @@ let in { stdenv -, autoreconfHook , autoconf269, automake, libtool , bison , buildPackages , fetchFromGitHub , fetchurl -, flex , gettext , lib , noSysDirs @@ -35,19 +33,6 @@ let version = "2.43.1"; - srcs = { - normal = fetchurl { - url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; - }; - vc4-none = fetchFromGitHub { - owner = "itszor"; - repo = "binutils-vc4"; - rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; - sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; - }; - }; - #INFO: The targetPrefix prepended to binary names to allow multiple binuntils # on the PATH to both be usable. targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -57,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; - src = srcs.${targetPlatform.system} or srcs.normal; + src = fetchurl { + url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; + hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; + }; # WARN: this package is used for bootstrapping fetchurl, and thus cannot use # fetchpatch! All mutable patches (generated by GitHub or cgit) that are @@ -90,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { # version detection in `libtool.m4` fails to detect the Darwin version correctly. ./0001-libtool.m4-update-macos-version-detection-block.patch ] - ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution # Patch from arch-community # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch @@ -117,9 +104,7 @@ stdenv.mkDerivation (finalAttrs: { bison perl ] - ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] - ++ lib.optionals targetPlatform.isVc4 [ flex ] ; buildInputs = [ zlib gettext ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/support-ios.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/support-ios.patch deleted file mode 100644 index 74e56d130e..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/support-ios.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/bfd/config.bfd b/bfd/config.bfd -index f04a993f06..1e24a9d030 100644 ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -238,7 +238,7 @@ case "${targ}" in - - # START OF targmatch.h - #ifdef BFD64 -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - targ_defvec=aarch64_mach_o_vec - targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -358,7 +358,7 @@ case "${targ}" in - targ_selvecs=arc_elf32_be_vec - ;; - -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - targ_defvec=arm_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -678,7 +678,7 @@ case "${targ}" in - i[3-7]86-*-aix*) - targ_defvec=i386_coff_vec - ;; -- i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) -+ i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) - targ_defvec=i386_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ64_selvecs=x86_64_mach_o_vec -@@ -762,7 +762,7 @@ case "${targ}" in - targ_defvec=x86_64_elf64_cloudabi_vec - want64=true - ;; -- x86_64-*-darwin*) -+ x86_64-*-darwin* | x86_64-*-ios*) - targ_defvec=x86_64_mach_o_vec - targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch" -@@ -1402,7 +1402,7 @@ case "${targ}" in - targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec" - targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec" - ;; -- powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*) -+ powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*) - targ_defvec=mach_o_be_vec - targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_i386_arch" -diff --git a/configure.ac b/configure.ac -index aae94501e4..2cceb4dad4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then - ;; - *-*-solaris2* | *-*-hpux11*) - ;; -- *-*-darwin* | *-*-aix*) -+ *-*-darwin* | *-*-ios* | *-*-aix*) - ;; - nvptx*-*-*) - ;; -@@ -700,13 +700,13 @@ esac - - # Disable libffi for some systems. - case "${target}" in -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs target-libffi" - ;; - *-*-netware*) -@@ -788,7 +788,7 @@ esac - # Disable the go frontend on systems where it is known to not work. Please keep - # this in sync with contrib/config-list.mk. - case "${target}" in --*-*-darwin* | *-*-cygwin* | *-*-mingw*) -+*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -797,7 +797,7 @@ esac - # For testing, you can easily override this with --enable-libgo. - if test x$enable_libgo = x; then - case "${target}" in -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -@@ -916,27 +916,27 @@ esac - case "${target}" in - *-*-chorusos) - ;; -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - noconfigdirs="$noconfigdirs ld gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - noconfigdirs="$noconfigdirs ld gas gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -@@ -1226,7 +1226,7 @@ case "${host}" in - hppa*-*) - host_makefile_frag="config/mh-pa" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - host_makefile_frag="config/mh-darwin" - ;; - powerpc-*-aix*) -@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - build_lto_plugin=yes - ],[if test x"$default_enable_lto" = x"yes" ; then - case $target in -- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; -+ *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; - # On other non-ELF platforms, LTO has yet to be validated. - *) enable_lto=no ;; - esac -@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - # warn during gcc/ subconfigure; unless you're bootstrapping with - # -flto it won't be needed until after installation anyway. - case $target in -- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; -+ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; - *) if test x"$enable_lto" = x"yes"; then - AC_MSG_ERROR([LTO support is not enabled for this target.]) - fi -@@ -2590,7 +2590,7 @@ rm -f conftest* - # Decide which environment variable is used to find dynamic libraries. - case "${host}" in - *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; -- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; -+ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; - *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; - *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; - esac diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index 8dc6c61283..cd1b5d5749 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.22"; + version = "1.13.23"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-zFF8cHElrWtLOa5xtO5N0520JC47rGOQ7YshEf12tCw="; + hash = "sha256-Fe4K6nBVg0l4Z3CW+k0OpUF8JEu+uINsA+jdAFJGmx8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix index 12d3e2aa7f..98ae24be7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustywind"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-dK8tO7rIsu1zVmA2reduBe8vM6L6oesig1tE+ajGSXM="; + hash = "sha256-NRIWjmKjteJibqnOjkkUY9eKIM65H7NaRX8rn1MdXmY="; }; - cargoHash = "sha256-yZQSY2zqVpmhMd6+Avg2vBh0WQB2FJ2fiMuy5x9Zl9U="; + cargoHash = "sha256-yUODUAhWtRGCj3U9nBlw3+5dNv6vGHXmJzUd8hGKnu0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix index ed2aa4e50d..99c4ef4429 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mockgen"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "uber-go"; repo = "mock"; rev = "v${version}"; - sha256 = "sha256-3nt70xrZisK5vgQa+STZPiY4F9ITKw8PbBWcKoBn4Vc="; + sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw="; }; - vendorHash = "sha256-mcNVud2jzvlPPQEaar/eYZkP71V2Civz+R5v10+tewA="; + vendorHash = "sha256-0OnK5/e0juEYrNJuVkr+tK66btRW/oaHpJSDakB32Bc="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 4b11dd7576..e7e53652fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,7 +2,6 @@ , stdenv , buildGoModule , fetchFromGitHub -, fetchpatch , installShellFiles , enableWasmEval ? false @@ -12,24 +11,15 @@ assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "buildin buildGoModule rec { pname = "open-policy-agent"; - version = "0.66.0"; + version = "0.69.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; + hash = "sha256-AEh6HBDLQYptBw68SQurPuWADxL5x5OirtJGQ+UKXdU="; }; - patches = [ - # fix tests in 1.22.5 - # https://github.com/open-policy-agent/opa/pull/6845 - (fetchpatch { - url = "https://github.com/open-policy-agent/opa/commit/956358516c23b1f33f6667961e20aca65b91355b.patch"; - hash = "sha256-1nfMwJwbYfdLg9j4ppP1IWdDeFq6vhXcDKr6uprP53U="; - }) - ]; - vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix index 67e90744c5..4e4753eff8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix @@ -1,4 +1,8 @@ -{ lib, callPackage }: +{ + lib, + callPackage, +}: + let inherit (lib) mapAttrs' nameValuePair; @@ -8,12 +12,12 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.12.1"; - hash = "sha256-kUUv36RiNK5EfUbVxPxOfgpwWPkElcS293+L7ruxVOM="; + version = "9.12.2"; + hash = "sha256-LvblR7CwfYQdYFJA3OTWNWd4MRSM0w9tVkuPT5KPc9I="; }; }; - callPnpm = variant: callPackage ./generic.nix {inherit (variant) version hash;}; + callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; mkPnpm = versionSuffix: variant: nameValuePair "pnpm_${versionSuffix}" (callPnpm variant); in diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix index 4ef68fdd50..d891600644 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -9,6 +9,7 @@ pnpm, yq, }: + { fetchDeps = { @@ -31,76 +32,79 @@ outputHash = ""; outputHashAlgo = "sha256"; }; - installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; + installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; in - stdenvNoCC.mkDerivation (finalAttrs: ( - args' - // { - name = "${pname}-pnpm-deps"; + stdenvNoCC.mkDerivation ( + finalAttrs: + ( + args' + // { + name = "${pname}-pnpm-deps"; - nativeBuildInputs = [ - cacert - jq - moreutils - pnpm - yq - ]; + nativeBuildInputs = [ + cacert + jq + moreutils + pnpm + yq + ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" - if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then - echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" - exit 1 - fi + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" + if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then + echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" + exit 1 + fi - export HOME=$(mktemp -d) - pnpm config set store-dir $out - # Some packages produce platform dependent outputs. We do not want to cache those in the global store - pnpm config set side-effects-cache false - # As we pin pnpm versions, we don't really care about updates - pnpm config set update-notifier false - # Run any additional pnpm configuration commands that users provide. - ${prePnpmInstall} - # pnpm is going to warn us about using --force - # --force allows us to fetch all dependencies including ones that aren't meant for our host platform - pnpm install \ - --force \ - --ignore-scripts \ - ${installFlags} \ - --frozen-lockfile + export HOME=$(mktemp -d) + pnpm config set store-dir $out + # Some packages produce platform dependent outputs. We do not want to cache those in the global store + pnpm config set side-effects-cache false + # As we pin pnpm versions, we don't really care about updates + pnpm config set update-notifier false + # Run any additional pnpm configuration commands that users provide. + ${prePnpmInstall} + # pnpm is going to warn us about using --force + # --force allows us to fetch all dependencies including ones that aren't meant for our host platform + pnpm install \ + --force \ + --ignore-scripts \ + ${installFlags} \ + --frozen-lockfile - runHook postInstall - ''; + runHook postInstall + ''; - fixupPhase = '' - runHook preFixup + fixupPhase = '' + runHook preFixup - # Remove timestamp and sort the json files - rm -rf $out/v3/tmp - for f in $(find $out -name "*.json"); do - jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f - done + # Remove timestamp and sort the json files + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f + done - runHook postFixup - ''; + runHook postFixup + ''; - passthru = { - serve = callPackage ./serve.nix { - inherit pnpm; - pnpmDeps = finalAttrs.finalPackage; + passthru = { + serve = callPackage ./serve.nix { + inherit pnpm; + pnpmDeps = finalAttrs.finalPackage; + }; }; - }; - dontConfigure = true; - dontBuild = true; - outputHashMode = "recursive"; - } - // hash' - )); + dontConfigure = true; + dontBuild = true; + outputHashMode = "recursive"; + } + // hash' + ) + ); configHook = makeSetupHook { name = "pnpm-config-hook"; diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/serve.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/serve.nix index a44022d841..a60aaa3b92 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/serve.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/serve.nix @@ -1,4 +1,9 @@ -{ writeShellApplication, pnpm, pnpmDeps }: +{ + writeShellApplication, + pnpm, + pnpmDeps, +}: + writeShellApplication { name = "serve-pnpm-store"; diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/generic.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/generic.nix index 7050df4489..0eb8467a42 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/generic.nix @@ -7,10 +7,11 @@ nodejs, testers, withNode ? true, - version, hash, -}: stdenvNoCC.mkDerivation (finalAttrs: { +}: + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "pnpm"; inherit version; @@ -26,7 +27,10 @@ buildInputs = lib.optionals withNode [ nodejs ]; - nativeBuildInputs = [ installShellFiles nodejs ]; + nativeBuildInputs = [ + installShellFiles + nodejs + ]; installPhase = '' runHook preInstall @@ -40,41 +44,49 @@ ''; postInstall = - if lib.toInt (lib.versions.major version) < 9 then '' - export HOME="$PWD" - node $out/bin/pnpm install-completion bash - node $out/bin/pnpm install-completion fish - node $out/bin/pnpm install-completion zsh - sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh - installShellCompletion \ - .config/tabtab/bash/pnpm.bash \ - .config/tabtab/fish/pnpm.fish \ - .config/tabtab/zsh/pnpm.zsh - '' else '' - node $out/bin/pnpm completion bash >pnpm.bash - node $out/bin/pnpm completion fish >pnpm.fish - node $out/bin/pnpm completion zsh >pnpm.zsh - sed -i '1 i#compdef pnpm' pnpm.zsh - installShellCompletion pnpm.{bash,fish,zsh} - ''; + if lib.toInt (lib.versions.major version) < 9 then + '' + export HOME="$PWD" + node $out/bin/pnpm install-completion bash + node $out/bin/pnpm install-completion fish + node $out/bin/pnpm install-completion zsh + sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh + installShellCompletion \ + .config/tabtab/bash/pnpm.bash \ + .config/tabtab/fish/pnpm.fish \ + .config/tabtab/zsh/pnpm.zsh + '' + else + '' + node $out/bin/pnpm completion bash >pnpm.bash + node $out/bin/pnpm completion fish >pnpm.fish + node $out/bin/pnpm completion zsh >pnpm.zsh + sed -i '1 i#compdef pnpm' pnpm.zsh + installShellCompletion pnpm.{bash,fish,zsh} + ''; - passthru = let - fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; - in { - inherit (fetchDepsAttrs) fetchDeps configHook; + passthru = + let + fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; + in + { + inherit (fetchDepsAttrs) fetchDeps configHook; - tests.version = lib.optionalAttrs withNode ( - testers.testVersion { package = finalAttrs.finalPackage; } - ); - }; + tests.version = lib.optionalAttrs withNode ( + testers.testVersion { package = finalAttrs.finalPackage; } + ); + }; - meta = with lib; { + meta = { description = "Fast, disk space efficient package manager for JavaScript"; homepage = "https://pnpm.io/"; changelog = "https://github.com/pnpm/pnpm/releases/tag/v${finalAttrs.version}"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Scrumplex + gepbird + ]; + platforms = lib.platforms.all; mainProgram = "pnpm"; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix index 0ec1dc8fe5..f60bd61e80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "roswell"; - version = "23.10.14.114"; + version = "24.10.115"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - hash = "sha256-70BSwRKj1WPvWxQzWPrs8ECkcVosAUaX5cK7FaDUhRc="; + hash = "sha256-2aYA1AzRPXaM82Sh+dMiQJcOAD0rzwV09VyLy0oS6as="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index 8bc991d0bd..2ba9fe941d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.38.0"; + version = "0.40.0"; src = fetchCrate { inherit pname version; - hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; + hash = "sha256-FXScN4xOaJOiEm9NV66wsfGOj7up1DPzLK7lMofXL2g="; }; - cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; + cargoHash = "sha256-v7K62jMGNwIo1XbkWpIXuoNkaRGRAqvZ/c9wdKfY+Xs="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix index 53f941e788..51994805f3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; + sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; }; - cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; + cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix b/third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix index f2fe98c0d4..3b92959d2f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "xcodes"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "XcodesOrg"; repo = "xcodes"; rev = finalAttrs.version; - hash = "sha256-ARrSQ9ozM90Yg7y4WdU7jjNQ64sXHuhxZh/iNJcFfY0="; + hash = "sha256-vksfvrx0TqtjcOHn38Ey3P6jIFYF4CbD3SVICVFINSU="; }; nativeBuildInputs = [ swift swiftpm makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix b/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix index 32ec081a93..669a8e3000 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix @@ -5,9 +5,9 @@ "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg"; "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7"; "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l"; - "LegibleError" = "08x5agha74chq1z5c7c5r2vasdk81pyl2k085miapd4l3jszz4fj"; + "LegibleError" = "137hc96cqpiwsyybj2xawyfmqh7rmk1khqkiqp3616ql909mh99y"; "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83"; - "PromiseKit" = "0vlkd4famjgbd4qs2ldi5aqg13nk77h7ddsdigyxxzgkwgxl076d"; + "PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg"; "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0"; "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9"; "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8"; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json b/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json index f13a3a54c6..cddcff1700 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json +++ b/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json @@ -62,8 +62,8 @@ }, "state": { "checkoutState": { - "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710", - "version": "1.0.4" + "revision": "bc596702d7ff618c3f90ba480eeb48b3e83a2fbe", + "version": "1.0.6" }, "name": "sourceControlCheckout" }, @@ -96,8 +96,8 @@ }, "state": { "checkoutState": { - "revision": "1c296a8637838901d2b01e4c46875ee749506133", - "version": "6.8.5" + "revision": "8a98e31a47854d3180882c8068cc4d9381bf382d", + "version": "6.22.1" }, "name": "sourceControlCheckout" }, diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 6e187aa3fe..67f147950d 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.29"; + version = "1.1.31"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - postPhases = [ "postPatchelf" ]; - postPatchelf = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + postPhases = lib.optionals (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) [ "postPatchelf" ]; + postPatchelf = '' completions_dir=$(mktemp -d) SHELL="bash" $out/bin/bun completions $completions_dir @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-RSMuealmdHe7qGFwhK9e51TED3PaCwSqzd4aj2RKMxE="; + hash = "sha256-dOQFfkxCiOFmAr11CjSdSKNpiLERkbVWawAuy8ASkJE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-gY+MDJqDjQamxQsk/CJJVuHsBAfwgrebs/h6nI0HV78="; + hash = "sha256-ZuU14GvAtf1n1sA8amtZUSGp5iJ5qp/SI2wrw4Gwe/4="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-j5jpgofGcfjto/3CtBsC4QV411lUGdk2wHwLGmLduo4="; + hash = "sha256-qN8ciVHzHH8GgR89GDgfvteMV+YawMUQLiXNwYyN+wU="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-RnKczYB/IkUYVBnRktCFhHsmvObQovVMfCilqJq3q1g="; + hash = "sha256-zHitG4Ktt+iCKk9GrC3C4MRSWhUxh89kW9bUeHzqNJs="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/third_party/nixpkgs/pkgs/games/corsix-th/default.nix b/third_party/nixpkgs/pkgs/games/corsix-th/default.nix index 8e393904b9..4dee7418cb 100644 --- a/third_party/nixpkgs/pkgs/games/corsix-th/default.nix +++ b/third_party/nixpkgs/pkgs/games/corsix-th/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, curl , doxygen , ffmpeg , freetype @@ -14,19 +15,21 @@ , libiconv , Cocoa , CoreVideo +, CoreMedia +, VideoToolbox # Update , nix-update-script }: stdenv.mkDerivation(finalAttrs: { pname = "corsix-th"; - version = "0.67"; + version = "0.68.0"; src = fetchFromGitHub { owner = "CorsixTH"; repo = "CorsixTH"; rev = "v${finalAttrs.version}"; - hash = "sha256-WA/VJqHXzBfVUBNtxCVsGBRzSRQ0pvDvAy03ntc0KZE="; + hash = "sha256-D8ks+fiFJxwClqW1aNtGGa5UxAFvuH2f2guwPxOEQwI="; }; patches = [ @@ -38,6 +41,7 @@ stdenv.mkDerivation(finalAttrs: { buildInputs = let luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]); in [ + curl ffmpeg freetype lua @@ -49,6 +53,8 @@ stdenv.mkDerivation(finalAttrs: { libiconv Cocoa CoreVideo + CoreMedia + VideoToolbox ]; cmakeFlags = [ "-Wno-dev" ]; diff --git a/third_party/nixpkgs/pkgs/games/ddnet/default.nix b/third_party/nixpkgs/pkgs/games/ddnet/default.nix index baeabd63eb..88397cb552 100644 --- a/third_party/nixpkgs/pkgs/games/ddnet/default.nix +++ b/third_party/nixpkgs/pkgs/games/ddnet/default.nix @@ -36,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.4"; + version = "18.6"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-BoEFh0lCd2pCIod5sFafnOs/TQHj/SlIAU8P4o+cjyE="; + hash = "sha256-thAB7QtR23j39ORK1YT2Idp4J7GffbNV7snbLAnYzMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-1MJ5cP4lyRSZ7VRED8RL5scnqpcy8/avmBKW1Zmt6FU="; + hash = "sha256-/kCsAZP9cwUQFcNnk5/eYMzw80Bh4JnwPXd299p1JEU="; }; nativeBuildInputs = [ @@ -92,13 +92,6 @@ stdenv.mkDerivation rec { Security ]); - patches = [ - (fetchpatch { - url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; - hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; - }) - ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ @@ -122,6 +115,11 @@ stdenv.mkDerivation rec { rm -rf $out/share/metainfo ''; + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Upstream links against /lib while it installs this library in /lib/ddnet + install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet" + ''; + meta = with lib; { description = "Teeworlds modification with a unique cooperative gameplay"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix deleted file mode 100644 index c213a6317b..0000000000 --- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, makeWrapper -, pkg-config -, nasm -, makeDesktopItem -, copyDesktopItems -, alsa-lib -, flac -, gtk2 -, libvorbis -, libvpx -, libGL -, SDL2 -, SDL2_mixer -, AGL -, Cocoa -, GLUT -, OpenGL -, graphicsmagick -}: - -let - wrapper = "eduke32-wrapper"; - swWrapper = "voidsw-wrapper"; - -in stdenv.mkDerivation (finalAttrs: { - pname = "eduke32"; - version = "0-unstable-2024-02-17"; - - src = fetchFromGitLab { - domain = "voidpoint.io"; - owner = "terminx"; - repo = "eduke32"; - rev = "8afa42e388e0434b38979fdddc763363717a2727"; - hash = "sha256-dyZ4JtDBxsTDe9uQDWxJe7M74X7m+5wpEHm+i+s9hwo="; - }; - - patches = [ - # gdk-pixbuf-csource no longer supports bmp so convert to png - # patch GNUMakefile to use graphicsmagick to convert bmp -> png - ./convert-bmp-to-png.diff - ]; - - buildInputs = [ - flac - libvorbis - libvpx - SDL2 - SDL2_mixer - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - gtk2 - libGL - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - Cocoa - GLUT - OpenGL - ]; - - nativeBuildInputs = [ - makeWrapper - pkg-config - copyDesktopItems - graphicsmagick - ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ - nasm - ]; - - postPatch = '' - substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \ - --replace-fail '#include ' '#include ' \ - --replace-fail '#include ' '#include ' \ - --replace-fail '#include ' '#include ' - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - for f in glad.c glad_wgl.c ; do - substituteInPlace source/glad/src/$f \ - --replace-fail libGL.so ${libGL}/lib/libGL.so - done - ''; - - makeFlags = [ - "SDLCONFIG=${SDL2}/bin/sdl2-config" - ]; - - buildFlags = [ - "duke3d" - "sw" - ]; - - desktopItems = [ - (makeDesktopItem { - name = "eduke32"; - icon = "eduke32"; - exec = "${wrapper}"; - comment = "Duke Nukem 3D port"; - desktopName = "Enhanced Duke Nukem 3D"; - genericName = "Duke Nukem 3D port"; - categories = [ "Game" ]; - }) - (makeDesktopItem { - name = "voidsw"; - icon = "voidsw"; - exec = "${swWrapper}"; - comment = "Shadow Warrior eduke32 source port"; - desktopName = "VoidSW"; - genericName = "Shadow Warrior source port"; - categories = [ "Game" ]; - }) - ]; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \ - --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ - --add-flags '-g "$EDUKE32_DATA_DIR/DUKE3D.GRP"' - makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \ - --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ - --add-flags '-g"$EDUKE32_DATA_DIR/SW.GRP"' - mkdir -p $out/share/icons/hicolor/scalable/apps - gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png - install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications/EDuke32.app/Contents/MacOS - mkdir -p $out/Applications/Mapster32.app/Contents/MacOS - mkdir -p $out/Applications/VoidSW.app/Contents/MacOS - mkdir -p $out/Applications/Wangulator.app/Contents/MacOS - - cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/ - cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/ - cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/ - cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/ - - ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32 - ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32 - ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw - ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator - '' + '' - runHook postInstall - ''; - - meta = { - description = "Enhanched port of Duke Nukem 3D for various platforms"; - homepage = "http://eduke32.com"; - license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ mikroskeem sander ]; - platforms = lib.platforms.all; - }; -}) diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix deleted file mode 100644 index aff5d11b30..0000000000 --- a/third_party/nixpkgs/pkgs/games/factorio/default.nix +++ /dev/null @@ -1,278 +0,0 @@ -{ lib -, alsa-lib -, factorio-utils -, fetchurl -, libGL -, libICE -, libSM -, libX11 -, libXcursor -, libXext -, libXi -, libXinerama -, libXrandr -, libpulseaudio -, libxkbcommon -, makeDesktopItem -, makeWrapper -, releaseType -, stdenv -, wayland - -, mods-dat ? null -, versionsJson ? ./versions.json -, username ? "" -, token ? "" # get/reset token at https://factorio.com/profile -, experimental ? false # true means to always use the latest branch -, ... -} @ args: - -assert releaseType == "alpha" - || releaseType == "headless" - || releaseType == "demo"; - -let - - inherit (lib) importJSON; - - mods = args.mods or [ ]; - - helpMsg = '' - - ===FETCH FAILED=== - Please ensure you have set the username and token with config.nix, or - /etc/nix/nixpkgs-config.nix if on NixOS. - - Your token can be seen at https://factorio.com/profile (after logging in). It is - not as sensitive as your password, but should still be safeguarded. There is a - link on that page to revoke/invalidate the token, if you believe it has been - leaked or wish to take precautions. - - Example: - { - packageOverrides = pkgs: { - factorio = pkgs.factorio.override { - username = "FactorioPlayer1654"; - token = "d5ad5a8971267c895c0da598688761"; - }; - }; - } - - Alternatively, instead of providing the username+token, you may manually - download the release through https://factorio.com/download , then add it to - the store using e.g.: - - releaseType=alpha - version=0.17.74 - nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz - - Note the ultimate "_" is replaced with "-" in the --name arg! - ''; - - desktopItem = makeDesktopItem { - name = "factorio"; - desktopName = "Factorio"; - comment = "A game in which you build and maintain factories."; - exec = "factorio"; - icon = "factorio"; - categories = [ "Game" ]; - }; - - branch = if experimental then "experimental" else "stable"; - - # NB `experimental` directs us to take the latest build, regardless of its branch; - # hence the (stable, experimental) pairs may sometimes refer to the same distributable. - versions = importJSON versionsJson; - binDists = makeBinDists versions; - - actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); - - makeBinDists = versions: - let - f = path: name: value: - if builtins.isAttrs value then - if value ? "name" then - makeBinDist value - else - builtins.mapAttrs (f (path ++ [ name ])) value - else - throw "expected attrset at ${toString path} - got ${toString value}"; - in - builtins.mapAttrs (f [ ]) versions; - makeBinDist = { name, version, tarDirectory, url, sha256, needsAuth }: { - inherit version tarDirectory; - src = - if !needsAuth then - fetchurl { inherit name url sha256; } - else - (lib.overrideDerivation - (fetchurl { - inherit name url sha256; - curlOptsList = [ - "--get" - "--data-urlencode" - "username@username" - "--data-urlencode" - "token@token" - ]; - }) - (_: { - # This preHook hides the credentials from /proc - preHook = - if username != "" && token != "" then '' - echo -n "${username}" >username - echo -n "${token}" >token - '' else '' - # Deliberately failing since username/token was not provided, so we can't fetch. - # We can't use builtins.throw since we want the result to be used if the tar is in the store already. - exit 1 - ''; - failureHook = '' - cat < str: - if FLAGS.out: - return FLAGS.out - try_paths = ["pkgs/games/factorio/versions.json", "versions.json"] - for path in try_paths: - if os.path.exists(path): - return path - raise Exception("Couldn't figure out where to write versions.json; try specifying --out") - - -def fetch_versions() -> FactorioVersionsJSON: - return json.loads(requests.get("https://factorio.com/api/latest-releases").text) - - -def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON: - rec_dd = lambda: defaultdict(rec_dd) - output = rec_dd() - - # Deal with times where there's no experimental version - for rc in RELEASE_CHANNELS: - if not factorio_versions[rc.name]: - factorio_versions[rc.name] = factorio_versions['stable'] - - for system in SYSTEMS: - for release_type in RELEASE_TYPES: - for release_channel in RELEASE_CHANNELS: - version = factorio_versions[release_channel.name].get(release_type.name) - if version == None: - continue - this_release = { - "name": f"factorio_{release_type.name}_{system.tar_name}-{version}.tar.xz", - "url": f"https://factorio.com/get-download/{version}/{release_type.name}/{system.url_name}", - "version": version, - "needsAuth": release_type.needs_auth, - "tarDirectory": system.tar_name, - } - output[system.nix_name][release_type.name][release_channel.name] = this_release - return output - - -def iter_version(versions: OurVersionJSON, it: Callable[[str, str, str, Dict[str, str]], Dict[str, str]]) -> OurVersionJSON: - versions = copy.deepcopy(versions) - for system_name, system in versions.items(): - for release_type_name, release_type in system.items(): - for release_channel_name, release in release_type.items(): - release_type[release_channel_name] = it(system_name, release_type_name, release_channel_name, dict(release)) - return versions - - -def merge_versions(old: OurVersionJSON, new: OurVersionJSON) -> OurVersionJSON: - """Copies already-known hashes from version.json to avoid having to re-fetch.""" - def _merge_version(system_name: str, release_type_name: str, release_channel_name: str, release: Dict[str, str]) -> Dict[str, str]: - old_system = old.get(system_name, {}) - old_release_type = old_system.get(release_type_name, {}) - old_release = old_release_type.get(release_channel_name, {}) - if FLAGS.release_type and release_type_name not in FLAGS.release_type: - logging.info("%s/%s/%s: not in --release_type, not updating", system_name, release_type_name, release_channel_name) - return old_release - if FLAGS.release_channel and release_channel_name not in FLAGS.release_channel: - logging.info("%s/%s/%s: not in --release_channel, not updating", system_name, release_type_name, release_channel_name) - return old_release - if not "sha256" in old_release: - logging.info("%s/%s/%s: not copying sha256 since it's missing", system_name, release_type_name, release_channel_name) - return release - if not all(old_release.get(k, None) == release[k] for k in ['name', 'version', 'url']): - logging.info("%s/%s/%s: not copying sha256 due to mismatch", system_name, release_type_name, release_channel_name) - return release - release["sha256"] = old_release["sha256"] - return release - return iter_version(new, _merge_version) - - -def nix_prefetch_url(name: str, url: str, algo: str = 'sha256') -> str: - cmd = ['nix-prefetch-url', '--type', algo, '--name', name, url] - logging.info('running %s', cmd) - out = subprocess.check_output(cmd) - return out.decode('utf-8').strip() - - -def fill_in_hash(versions: OurVersionJSON) -> OurVersionJSON: - """Fill in sha256 hashes for anything missing them.""" - urls_to_hash = {} - def _fill_in_hash(system_name: str, release_type_name: str, release_channel_name: str, release: Dict[str, str]) -> Dict[str, str]: - if "sha256" in release: - logging.info("%s/%s/%s: skipping fetch, sha256 already present", system_name, release_type_name, release_channel_name) - return release - url = release["url"] - if url in urls_to_hash: - logging.info("%s/%s/%s: found url %s in cache", system_name, release_type_name, release_channel_name, url) - release["sha256"] = urls_to_hash[url] - return release - logging.info("%s/%s/%s: fetching %s", system_name, release_type_name, release_channel_name, url) - if release["needsAuth"]: - if not FLAGS.username or not FLAGS.token: - raise Exception("fetching %s/%s/%s from %s requires --username and --token" % (system_name, release_type_name, release_channel_name, url)) - url += f"?username={FLAGS.username}&token={FLAGS.token}" - release["sha256"] = nix_prefetch_url(release["name"], url) - urls_to_hash[url] = release["sha256"] - return release - return iter_version(versions, _fill_in_hash) - - -def main(argv): - factorio_versions = fetch_versions() - new_our_versions = generate_our_versions(factorio_versions) - old_our_versions = None - our_versions_path = find_versions_json() - if our_versions_path: - logging.info('Loading old versions.json from %s', our_versions_path) - with open(our_versions_path, 'r') as f: - old_our_versions = json.load(f) - if old_our_versions: - logging.info('Merging in old hashes') - new_our_versions = merge_versions(old_our_versions, new_our_versions) - logging.info('Fetching necessary tars to get hashes') - new_our_versions = fill_in_hash(new_our_versions) - with open(our_versions_path, 'w') as f: - logging.info('Writing versions.json to %s', our_versions_path) - json.dump(new_our_versions, f, sort_keys=True, indent=2) - f.write("\n") - -if __name__ == '__main__': - app.run(main) diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json deleted file mode 100644 index 60e88c026f..0000000000 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "x86_64-linux": { - "alpha": { - "experimental": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", - "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" - }, - "stable": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", - "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" - } - }, - "demo": { - "experimental": { - "name": "factorio_demo_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/demo/linux64", - "version": "1.1.110" - }, - "stable": { - "name": "factorio_demo_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/demo/linux64", - "version": "1.1.110" - } - }, - "headless": { - "experimental": { - "name": "factorio_headless_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" - }, - "stable": { - "name": "factorio_headless_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" - } - } - } -} diff --git a/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix b/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix index 8ca1675591..dedce0dd3c 100644 --- a/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix +++ b/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix @@ -1,20 +1,21 @@ -{ coreutils -, fetchFromGitHub -, gnused -, lib -, maven -, makeWrapper -, openjdk +{ + coreutils, + fetchFromGitHub, + gnused, + lib, + maven, + makeWrapper, + openjdk, }: let - version = "1.6.57"; + version = "1.6.65"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-pxnnqLfyblbIgIRZZrx8Y8K43zUv9mu7PzZ7zltpEUQ="; + hash = "sha256-MCJl3nBHbX/O24bzD4aQ12eMWxYY2qJC5vomvtsIBek="; }; # launch4j downloads and runs a native binary during the package phase. @@ -25,7 +26,7 @@ maven.buildMavenPackage { pname = "forge-mtg"; inherit version src patches; - mvnHash = "sha256-QK9g0tG75lIhEtf4jW03N32YbD9Fe5iI0JTuqmCTtnE="; + mvnHash = "sha256-ouF0Ja3oGrlUCcT0PzI5i9FQ+oLdEhE/LvhJ0QGErvI="; doCheck = false; # Needs a running Xorg @@ -50,7 +51,13 @@ maven.buildMavenPackage { for commandToInstall in forge forge-adventure forge-adventure-editor; do chmod 555 $out/share/forge/$commandToInstall.sh makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \ - --prefix PATH : ${lib.makeBinPath [ coreutils openjdk gnused ]} \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + openjdk + gnused + ] + } \ --set JAVA_HOME ${openjdk}/lib/openjdk \ --set SENTRY_DSN "" done diff --git a/third_party/nixpkgs/pkgs/games/gshogi/default.nix b/third_party/nixpkgs/pkgs/games/gshogi/default.nix index 28013690cc..98bf06ac97 100644 --- a/third_party/nixpkgs/pkgs/games/gshogi/default.nix +++ b/third_party/nixpkgs/pkgs/games/gshogi/default.nix @@ -30,6 +30,12 @@ python3.pkgs.buildPythonApplication rec { pycairo ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "http://johncheetham.com/projects/gshogi/"; description = "Graphical implementation of the Shogi board game, also known as Japanese Chess"; diff --git a/third_party/nixpkgs/pkgs/games/gweled/default.nix b/third_party/nixpkgs/pkgs/games/gweled/default.nix deleted file mode 100644 index f76085b77d..0000000000 --- a/third_party/nixpkgs/pkgs/games/gweled/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchbzr, gettext -, gtk2, wrapGAppsHook3, autoreconfHook, pkg-config -, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: - -stdenv.mkDerivation rec { - pname = "gweled"; - version = "unstable-2021-02-11"; - - src = fetchbzr { - url = "lp:gweled"; - rev = "108"; - hash = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; - }; - - doCheck = false; - - postPatch = '' - substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" - ''; - - nativeBuildInputs = [ wrapGAppsHook3 gettext autoreconfHook pkg-config ]; - - buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; - - configureFlags = [ "--disable-setgid" ]; - - meta = with lib; { - description = "Bejeweled clone game"; - mainProgram = "gweled"; - homepage = "https://gweled.org"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index 131dea9c02..ad68279740 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-3PiB8CT7wxGmvRuQQ5FIAmBqBm9+R55ry+N/qUYWzuk="; + hash = "sha256-/7JIeQZt3QsKrjujSucRLiHfhfSllK7FeumNA4eHqSY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix b/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix index 7848b5feba..f618d66805 100644 --- a/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix +++ b/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "hikounomizu"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { url = "http://download.tuxfamily.org/hnm/${finalAttrs.version}/hikounomizu-${finalAttrs.version}-src.tar.bz2"; - hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; + hash = "sha256-rWy6m9Wc6w0PSSS8WUMeCNvXok2hRioKRGR6a1tyPks="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json index 4f032415a0..f77f6653b3 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json @@ -1,332 +1,332 @@ { "bluedevil": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/bluedevil-6.2.1.tar.xz", - "hash": "sha256-B0O5qCynj2hayN8tmTCa/c/s2PhnMqltLNZvQZHOSwM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/bluedevil-6.2.2.tar.xz", + "hash": "sha256-0qMvgE6tLgTMJdyQ9nwlwVhRLFDUNLp+tvlql0zEyEk=" }, "breeze": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-6.2.1.tar.xz", - "hash": "sha256-91X/9z0cTcYbaHIYfO2Mxvho4O9lVlmalzFQhVL43J4=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-6.2.2.tar.xz", + "hash": "sha256-nwdWjVQ1E7mEhwgX092iUs8VJPEWF70xOKcdK/ZYllw=" }, "breeze-grub": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-grub-6.2.1.tar.xz", - "hash": "sha256-wmHD53dQHd1lrLKiy90fksVBSKPFwyc0i+XxsPcJCXE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-grub-6.2.2.tar.xz", + "hash": "sha256-LrLd0q2RFBkI8RNNuCLLLk15nYMEGtdx664NCgYaqjA=" }, "breeze-gtk": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-gtk-6.2.1.tar.xz", - "hash": "sha256-i1R41rcFaD8MLAdc6D4RN62X7WRNGjOdj5gsTcEj7w4=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-gtk-6.2.2.tar.xz", + "hash": "sha256-fMI0lLRQ0ZeahuH1YQzaXnmOJOF06CCiUTEBTHjLJKE=" }, "breeze-plymouth": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/breeze-plymouth-6.2.1.tar.xz", - "hash": "sha256-esFwowhZ1E2zT4+GOW8APyEJMd8WUgppYkFPsAXqzhI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/breeze-plymouth-6.2.2.tar.xz", + "hash": "sha256-uWNdgObKazysk4jPbNhbQZJZX0AnRCvrbKuuFRByY1I=" }, "discover": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/discover-6.2.1.tar.xz", - "hash": "sha256-ce0t9IFEHvaeHVxvCZfwN22DqHFIUcbQFNEWS8jubZE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/discover-6.2.2.tar.xz", + "hash": "sha256-1P76+qm1uYAFIiopjPy34+HImCDQ74wCVA4aghCNWq4=" }, "drkonqi": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/drkonqi-6.2.1.tar.xz", - "hash": "sha256-Xk260ZoKtwgFsR/tGO7bmhW7F1O8RESKkts8lpRWVVA=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/drkonqi-6.2.2.tar.xz", + "hash": "sha256-YBZQ1R4XgH+QbTEKY0ax+Pgr6chJwkWBdSgXdxjw03k=" }, "flatpak-kcm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/flatpak-kcm-6.2.1.tar.xz", - "hash": "sha256-yKHwSAEXPqTEZktkk/8GizkL1AL3GrKBIra75xz5WYc=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/flatpak-kcm-6.2.2.tar.xz", + "hash": "sha256-hLMbgFjV3j8W12aYvFN1UKxMN2Qi79c8AlfvfvnstJU=" }, "kactivitymanagerd": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kactivitymanagerd-6.2.1.tar.xz", - "hash": "sha256-vdggWWIqm6oB4Y4OS7JRoUyEG52mGjjlVoiGwwk8jM4=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kactivitymanagerd-6.2.2.tar.xz", + "hash": "sha256-8lCgQowfkB4Uw3Wa2+EfGycIwIiWYDessgMWXUAKLOE=" }, "kde-cli-tools": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kde-cli-tools-6.2.1.tar.xz", - "hash": "sha256-8Hc3ImgJg70jdR3nVOl9SmxLfP/I/OzFgPFHK4eRNik=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kde-cli-tools-6.2.2.tar.xz", + "hash": "sha256-gWSpt+ok1kxZOaUK0D1hMkExfqZWtSu7AK/WU/FEMGw=" }, "kdecoration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kdecoration-6.2.1.tar.xz", - "hash": "sha256-k4ALPfgtDPf8IuTN99tnyJi7GUMXJR3FkzRL4ELpkIg=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kdecoration-6.2.2.tar.xz", + "hash": "sha256-t/hhoY4q9jipyF8S4YMGwFefi8HwnspsNDNfWN0se5A=" }, "kde-gtk-config": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kde-gtk-config-6.2.1.tar.xz", - "hash": "sha256-9WPUFglLK5N41LgDNt4N3tA4ddnqxx/4hDwQTLhn5ew=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kde-gtk-config-6.2.2.tar.xz", + "hash": "sha256-uon7E143+qFUSpvimhDCpAAp39U69M6zQyicamk2UGY=" }, "kdeplasma-addons": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kdeplasma-addons-6.2.1.tar.xz", - "hash": "sha256-3yAM0Gs+aMZjnX/JJ9OK4vp/n60MtHLfalpuEkqHs1o=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kdeplasma-addons-6.2.2.tar.xz", + "hash": "sha256-YhfbbWkGC7tvBP9MqChEgfilUyvwnXKBLPo+veoBH2w=" }, "kgamma": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kgamma-6.2.1.tar.xz", - "hash": "sha256-PPdzDPFg/WjbNyY++t62BX8fslrfGc2OXoZfS4ju4JE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kgamma-6.2.2.tar.xz", + "hash": "sha256-NFIpiLp0Rea/GqeurUGf9UtuGvzNNKyKlRlBarahDc4=" }, "kglobalacceld": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kglobalacceld-6.2.1.tar.xz", - "hash": "sha256-wTPtjyZ/jkDiAp/xh++zByDwPJ5fXk2ozYXaCgDJ7dQ=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kglobalacceld-6.2.2.tar.xz", + "hash": "sha256-TMREScRF1e8lHNCgbhhICkt4D+yv08bF+6dYpW9+zmw=" }, "kinfocenter": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kinfocenter-6.2.1.tar.xz", - "hash": "sha256-UEFi5sm6kfPRrwiY3r4rapw/UVv/tYkifnOZB7aAYOs=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kinfocenter-6.2.2.tar.xz", + "hash": "sha256-QNU669MdJarDrOYBuyIil71T0rcfUQy/jqxLpZkrVHc=" }, "kmenuedit": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kmenuedit-6.2.1.tar.xz", - "hash": "sha256-wRQpdz3j5Z6q5ZWNHHy+ul5o37oObguttYiPFaZSyRE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kmenuedit-6.2.2.tar.xz", + "hash": "sha256-46AhY5rISrYq8qWfhtpRibge2semboy0A8ndJ19S49E=" }, "kpipewire": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kpipewire-6.2.1.tar.xz", - "hash": "sha256-FnXi8G4gZhpdd0AFM9VSoyotbcwtntoCvKjlrbvCQ8g=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kpipewire-6.2.2.tar.xz", + "hash": "sha256-Einbl0R8wH5i5KHMPHxeW07djBcu4bki/Se1isN4QlU=" }, "krdp": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/krdp-6.2.1.tar.xz", - "hash": "sha256-kPS/BBkVS00WEyy5b0G7DUk+U/klPkIZyM5taSW2I48=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/krdp-6.2.2.tar.xz", + "hash": "sha256-BTlishksVJliNIvNAcKshO9Plk3K+htPbWc1thChynI=" }, "kscreen": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kscreen-6.2.1.tar.xz", - "hash": "sha256-PjKubDeHF4qJgxjALVrqmzQe6M4pIgc/6s9Nq+P0lM8=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kscreen-6.2.2.tar.xz", + "hash": "sha256-ogCrhAx49+XkIC9GMPYS7/7ETWLtkdm6p6BexnhYRfA=" }, "kscreenlocker": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kscreenlocker-6.2.1.tar.xz", - "hash": "sha256-w6FzDNdeyPh+2kybWy9JHVnZiz0GyT98NyHupWkLYBk=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kscreenlocker-6.2.2.tar.xz", + "hash": "sha256-HIVj6BG9qApqEp3VSJfDX7QDRbn1qg6c2Z0eKAgqdpk=" }, "ksshaskpass": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/ksshaskpass-6.2.1.tar.xz", - "hash": "sha256-ucB2+ryf+87xcu7ChMGovek7u7YNfefqSqyLxS4ay3I=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/ksshaskpass-6.2.2.tar.xz", + "hash": "sha256-8WTx49yaGDbm/44FxBLvHZ9De+GdRYP5sfa4DfdqC44=" }, "ksystemstats": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/ksystemstats-6.2.1.tar.xz", - "hash": "sha256-wxmKliFrSOh1Tl38cKj2da97Nd7z/gY/cnBEg51FoHM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/ksystemstats-6.2.2.tar.xz", + "hash": "sha256-2zr6S9irdMYDUahcrxnlwLAJWjiKJLR9OpVyg9hd3/s=" }, "kwallet-pam": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwallet-pam-6.2.1.tar.xz", - "hash": "sha256-R6vvzbF5B1qA63EMeWzb4ts0MvBb3jbvgallnBK+jzI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwallet-pam-6.2.2.tar.xz", + "hash": "sha256-J7v6r2Txvvmn36uyp2tc8ibS5w9MrZt0D/gELFuCaoc=" }, "kwayland": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwayland-6.2.1.tar.xz", - "hash": "sha256-veB00J2Wx0SEFmR8RP8+1HulVGA1OzLAD1UCjqjqDHw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwayland-6.2.2.tar.xz", + "hash": "sha256-7FNMWmBXJl/qrBK24XPMgj+MuqZcmOUKsGfK+wGDDwU=" }, "kwayland-integration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwayland-integration-6.2.1.tar.xz", - "hash": "sha256-/L3qETy8AqWynHrVApoLxwXctp+3TTojZDfUebwrV2c=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwayland-integration-6.2.2.tar.xz", + "hash": "sha256-kmMnAF5BHrfvVNc6xprL1PZNcpwQarXoN4BCRF31IW4=" }, "kwin": { - "version": "6.2.1.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwin-6.2.1.1.tar.xz", - "hash": "sha256-Qqc6q2yExt/NdhNoajmkkDIMadbVk6PEwkV4xioZIeg=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwin-6.2.2.tar.xz", + "hash": "sha256-+1wv8+gAdyLz+lKIcuZJTcIdSMimtjK3SEhjiUhrwGE=" }, "kwrited": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/kwrited-6.2.1.tar.xz", - "hash": "sha256-0jTymV4c3aokfGkZO9qqrdfQYJLX8E8aDyzmELHb2/8=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/kwrited-6.2.2.tar.xz", + "hash": "sha256-Q9tHMEKQ7OumYxqBqdGeeWI9hC6hhFTe1j/SuU8ALrU=" }, "layer-shell-qt": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/layer-shell-qt-6.2.1.tar.xz", - "hash": "sha256-EehtMH+Z6aeGl/TQtLEVKOSgliKCZdxm5Y8pnmw5eUM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/layer-shell-qt-6.2.2.tar.xz", + "hash": "sha256-B+a1sbOlQ7asOGvquwXh8P4NTTSnIPuam2K89CZAV1o=" }, "libkscreen": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/libkscreen-6.2.1.tar.xz", - "hash": "sha256-DPkTb8p5t2fUzaWnBOLaBQdPBfKb/+FUr8IOYz2vLtQ=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/libkscreen-6.2.2.tar.xz", + "hash": "sha256-Nh6K8NDFpI+eSiOCFsMoNPlCTbQgQh/eQv1+OBNWUa0=" }, "libksysguard": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/libksysguard-6.2.1.tar.xz", - "hash": "sha256-I0yghbqbFGep148OJ79Zwh4AZintLZ43Mvhy/iLhKYM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/libksysguard-6.2.2.tar.xz", + "hash": "sha256-7qiUfOWrj4L9k1JGTElBi9l0YJIbYUl+kRjQZWrw/Z8=" }, "libplasma": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/libplasma-6.2.1.tar.xz", - "hash": "sha256-i6+pBIt0Pe7PWVpjqQeo5vtL1OnLF6rDNgaPp7l7CpM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/libplasma-6.2.2.tar.xz", + "hash": "sha256-30Panz10XO7OG8/CxnRhB1U7ufN78OwK0QJTQYx+YEg=" }, "milou": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/milou-6.2.1.tar.xz", - "hash": "sha256-cVwQrD0e9MbNYwrrlqWsIfkSA5qbLb5/GrzzeT0PjNI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/milou-6.2.2.tar.xz", + "hash": "sha256-Z2hk5RT+xzrvNG8UC1dRSoYQiA+yUK9/jn9zv+zr1O0=" }, "ocean-sound-theme": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/ocean-sound-theme-6.2.1.tar.xz", - "hash": "sha256-VBNKaaOPUzHM41ZwBPPGfU133ows7qc1llRxUxQvvNw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/ocean-sound-theme-6.2.2.tar.xz", + "hash": "sha256-bxmh2jl5BEnMkCo8ypUsLl2Tqh9GRDjHtXQDUt31l6U=" }, "oxygen": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/oxygen-6.2.1.tar.xz", - "hash": "sha256-bGvSFwQGLi6HsBHaM/G3Tn8JSWdfSHv8KQ0aMmY0Cyo=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/oxygen-6.2.2.tar.xz", + "hash": "sha256-qIOPI2Orj8L/bo1XNcHwNKaWXDHxUVoWThQky7WKp7g=" }, "oxygen-sounds": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/oxygen-sounds-6.2.1.tar.xz", - "hash": "sha256-DiDGF8hVzS/ciZBepYZfR5cz7QSWfNkPmIjp4ahGrak=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/oxygen-sounds-6.2.2.tar.xz", + "hash": "sha256-6R9fYq/fRGoPdpKBOp/QpW3QnV0Bmli2w7lZ2b9k3/w=" }, "plasma5support": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma5support-6.2.1.tar.xz", - "hash": "sha256-TqYzU5ac5euPpfvNPwN4dBqVF+uBp4HNWPYRUztWTns=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma5support-6.2.2.tar.xz", + "hash": "sha256-jiZld2i1Uzuxx67M1RZYtHphpmdQQ4v0slq5bWOoxzA=" }, "plasma-activities": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-activities-6.2.1.tar.xz", - "hash": "sha256-nzufWkr0aqoK7o55Bd8gdHtGyDjWme+niHbD6g0hRtI=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-activities-6.2.2.tar.xz", + "hash": "sha256-sTM7vOCzaXAcmd0fv3Q1wUpnRFDD1BW9zmxEwwptT/s=" }, "plasma-activities-stats": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-activities-stats-6.2.1.tar.xz", - "hash": "sha256-cGzkdptOthQLCXVcaIp9y2QtF5G0ceK2JZNciTxKhqM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-activities-stats-6.2.2.tar.xz", + "hash": "sha256-Zl/uz78Ec77cbXfdYG9rJ3FWZybV6uXp8ndIgJX9EKU=" }, "plasma-browser-integration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-browser-integration-6.2.1.tar.xz", - "hash": "sha256-B1j2IJ2myCSpl47vlCfRvz2WGHsfz8MZqMBggr5x7So=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-browser-integration-6.2.2.tar.xz", + "hash": "sha256-a8Smt5Qcig0S1S0WfLsUEKIl1DoPd9NTAXsslB5naw4=" }, "plasma-desktop": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-desktop-6.2.1.tar.xz", - "hash": "sha256-HU/oDE89jrdlZBKV2yjrkXOwdvBbgGZhfHumOig7v7c=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-desktop-6.2.2.tar.xz", + "hash": "sha256-yD/mI5KyOZeUS6kJWc6ud7O0suawISI979rTaB0wrk8=" }, "plasma-dialer": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-dialer-6.2.1.tar.xz", - "hash": "sha256-ujia8MeIN6TVvcJx8Vm3s5GTnTV4ezhTEu5eVSh2YKE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-dialer-6.2.2.tar.xz", + "hash": "sha256-6sfaDmcpcB9nIIg7EPimqVGLx8bofjXM84a5mFSnb2k=" }, "plasma-disks": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-disks-6.2.1.tar.xz", - "hash": "sha256-wDvWjl42z5Pakn+S3GDLRLh0qQbJPSoWASVjNTD/wQo=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-disks-6.2.2.tar.xz", + "hash": "sha256-oBAbEN1vS7vdR5oM6K5gwvuamMyILKHhxZtTTGYaF+k=" }, "plasma-firewall": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-firewall-6.2.1.tar.xz", - "hash": "sha256-riGK+t5sH8/stNSpeBH7ESWtVXtXopimeZ/GPerooG0=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-firewall-6.2.2.tar.xz", + "hash": "sha256-0slIvf/N+YHQ01Tj9ZjxXb6tGEbHwLTL/nqrH0HQstU=" }, "plasma-integration": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-integration-6.2.1.tar.xz", - "hash": "sha256-pOorneCR1C/896p3jDvirc68V7gqH142EG8DberdM+k=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-integration-6.2.2.tar.xz", + "hash": "sha256-0y0FS+aUdifwXdtXQmCmpJdoanyT7GLRySkWgHS/tTk=" }, "plasma-mobile": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-mobile-6.2.1.tar.xz", - "hash": "sha256-LjH5TzwBDwdgZjBVapOZt8bNMjpnq1ELJZov+udCvyQ=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-mobile-6.2.2.tar.xz", + "hash": "sha256-DCo+14fav1i1FcdzPNqeB61b93N7+El9s7/qkNjJZ6I=" }, "plasma-nano": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-nano-6.2.1.tar.xz", - "hash": "sha256-MK/GCxMpTCxzVvo60paZSrkmoIbomFHHA8jq/fU5ZN0=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-nano-6.2.2.tar.xz", + "hash": "sha256-XGxGvTzJAfatvAvzaYU96YNOwstvhWVQGBXdcv9uh8w=" }, "plasma-nm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-nm-6.2.1.tar.xz", - "hash": "sha256-2XUnnwYRUQ3YAl407uJBnnx37poD9+l7tW2t5po+hyg=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-nm-6.2.2.tar.xz", + "hash": "sha256-jfmXvPFLEDG4soBVobz+IuVg6qSpGtKkJAKw24pExHA=" }, "plasma-pa": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-pa-6.2.1.tar.xz", - "hash": "sha256-9k5vtxJClgia3YnWz0P3YWWFTNvNwiz/MbAsxoBugu0=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-pa-6.2.2.tar.xz", + "hash": "sha256-L8gxbV1IUcfwHPECE0A9PnfLekoEWEvA3GN5cenSJlQ=" }, "plasma-sdk": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-sdk-6.2.1.tar.xz", - "hash": "sha256-+0RVKwsk5fGlA7J8gIQ6cW+6+sxqwMjM44VT8V9wkxw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-sdk-6.2.2.tar.xz", + "hash": "sha256-Tz/KKMFI7cHAlmiKChCCIYfXomJBakHUBLSDuMLAYg4=" }, "plasma-systemmonitor": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-systemmonitor-6.2.1.tar.xz", - "hash": "sha256-bte/HWDba4Kcxz2bZua6PDnopOqsxnWP+/FF8uVkqZo=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-systemmonitor-6.2.2.tar.xz", + "hash": "sha256-IEzWc7kWRJe5trUpLYtNaHQYDogV5yQZ7Vr3ZpPj00U=" }, "plasma-thunderbolt": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-thunderbolt-6.2.1.tar.xz", - "hash": "sha256-rFT3T7wBz77WWTQT6Pat29QgYz6ZGnKa9zjlpTR9QdU=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-thunderbolt-6.2.2.tar.xz", + "hash": "sha256-lVA5UAJmaQqfr4LYLsygvAWZ3ixweXWeDGyI2e+pYOM=" }, "plasma-vault": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-vault-6.2.1.tar.xz", - "hash": "sha256-eXYlKEZcvY468Pt1/aGE3G3V0J32C0hwECf6LO7JaI8=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-vault-6.2.2.tar.xz", + "hash": "sha256-LBC//UbV/dx409k0q2OQ1QKxAyX19vwikszEdo702K0=" }, "plasma-welcome": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-welcome-6.2.1.tar.xz", - "hash": "sha256-oKvYKyCe27g7Qx+GN2R4nGtS4WoXp3fA+Oz0rtWRFPw=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-welcome-6.2.2.tar.xz", + "hash": "sha256-DWDzg2WLBfggY7YDIxQk6Ok8OD0b4TcvAZBJlG5AX5E=" }, "plasma-workspace": { - "version": "6.2.1.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-workspace-6.2.1.1.tar.xz", - "hash": "sha256-9tzQxRlttLYRsUPQUNwNYqMFxIlO/sEFzRz+jNnQ1QY=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-workspace-6.2.2.tar.xz", + "hash": "sha256-vsyJRz1X3MV0qNnWJsyDtEbfJWekeKZj+B1Y/W6j+FM=" }, "plasma-workspace-wallpapers": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plasma-workspace-wallpapers-6.2.1.tar.xz", - "hash": "sha256-XMbV/NJl6uAoWzqbfPoarLYhmr6PcWVqKCTNPuPk8iE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plasma-workspace-wallpapers-6.2.2.tar.xz", + "hash": "sha256-fpl+ezHakeFsAfbktRdbvdhKuVeq96nvMKQUAJMRzTs=" }, "plymouth-kcm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/plymouth-kcm-6.2.1.tar.xz", - "hash": "sha256-FZ7i2PFpxiB67lyPcFrelSEg6CRq74Ir9v5lFn/HBhE=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/plymouth-kcm-6.2.2.tar.xz", + "hash": "sha256-yzg8HH06Fk3hmEF/SB8zIiNtuKXURBqL53RN1PdZ3Zs=" }, "polkit-kde-agent-1": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/polkit-kde-agent-1-6.2.1.tar.xz", - "hash": "sha256-lwPpP9tpu9qVNBjXSN7b8loWr9EW/FCZ6Kaht+QQEsc=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/polkit-kde-agent-1-6.2.2.tar.xz", + "hash": "sha256-NRA1M2Dex1xH1gUo1lUKavypHZfUZuNaTf2yVP5s9eo=" }, "powerdevil": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/powerdevil-6.2.1.tar.xz", - "hash": "sha256-W/oGj6MfEYeE5oHrl7nEn1qANMBiiwmcAFL9+xKcPmU=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/powerdevil-6.2.2.tar.xz", + "hash": "sha256-QAby9JV0xOADa7Jb07Gh5cR6UhsmgG+kAw2Ac/2xe9k=" }, "print-manager": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/print-manager-6.2.1.tar.xz", - "hash": "sha256-hQCsuZ1WSvNNT34FhZy7/+kWQcPXifJ4lAKRyCgMc88=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/print-manager-6.2.2.tar.xz", + "hash": "sha256-iKyxTmsrMG9pPFVvIfKPH/iuOTBAkO1WE5V2rdabsSo=" }, "qqc2-breeze-style": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/qqc2-breeze-style-6.2.1.tar.xz", - "hash": "sha256-dkvHgbyPufm5PPoANCQcdv/5TbHI9ODrLsZUJQKoAls=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/qqc2-breeze-style-6.2.2.tar.xz", + "hash": "sha256-7jWHLJZKFepISB/UgiAAbkJez4VakcK6pNv4sj+KQ8s=" }, "sddm-kcm": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/sddm-kcm-6.2.1.tar.xz", - "hash": "sha256-Wl0xBiI20kFl9FfriCn1RmydKu9KpqnzWG+CU9ZTv8E=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/sddm-kcm-6.2.2.tar.xz", + "hash": "sha256-Z8h+5THWU0xl8/y4w3e1yg/4M5yTVWW5iYbKo/wqxN4=" }, "spacebar": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/spacebar-6.2.1.tar.xz", - "hash": "sha256-5ueaEVK3AJNGCBWpg4e4jqgZNC5h85NT6V3/SiAen1U=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/spacebar-6.2.2.tar.xz", + "hash": "sha256-bLhNDcVKtKlGoZUD41sffLW3O59XE0Nt0gu0U26Xg3k=" }, "systemsettings": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/systemsettings-6.2.1.tar.xz", - "hash": "sha256-HgBl2eAAbnAvMmA0bXFujeJkyVQ3Hcw+91qBJnOAdbM=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/systemsettings-6.2.2.tar.xz", + "hash": "sha256-pTmeHdq12GxM98Y8NNfMp1mbG2zjjLyp1AVgIs9KSEQ=" }, "wacomtablet": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/wacomtablet-6.2.1.tar.xz", - "hash": "sha256-1L0/lWFH0mocuOc5cbEk98FdpGaFOYdnPEJLLNCkJhA=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/wacomtablet-6.2.2.tar.xz", + "hash": "sha256-Uj7gUVuHSXi4i77qTlbatgGliIHubbC5bQOc/yMvGEY=" }, "xdg-desktop-portal-kde": { - "version": "6.2.1", - "url": "mirror://kde/stable/plasma/6.2.1/xdg-desktop-portal-kde-6.2.1.tar.xz", - "hash": "sha256-hDT9KRapOI2ePorKjysW0MrVJonsPmuboRY9XzVmP28=" + "version": "6.2.2", + "url": "mirror://kde/stable/plasma/6.2.2/xdg-desktop-portal-kde-6.2.2.tar.xz", + "hash": "sha256-Zp+cFEaptzSQw+0UKJWyJzjtqYh+7L9izNnW0QUKPdM=" } } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix index 5e9ac62a97..6585f47b66 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix @@ -1,21 +1,18 @@ { lib, mkKdeDerivation, - fetchFromGitLab, + fetchurl, qtwebsockets, kdeclarative, kpackage, }: -mkKdeDerivation { +mkKdeDerivation rec { pname = "kunifiedpush"; - version = "unstable-2024-02-19"; + version = "1.0.0"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kunifiedpush"; - rev = "b89a31fb4f333a4e5d6c475a030147c8bdcffec6"; - hash = "sha256-bhlsEP7cLuA6Rj6nrpp5iC3uolc02twNMLsWl+d/BXo="; + src = fetchurl { + url = "mirror://kde/stable/kunifiedpush/kunifiedpush-${version}.tar.xz"; + sha256 = "sha256-Ld66ITBtAwcRTsUKLDgVnsYjWfn8bN1Y2jCjafvVUM8="; }; extraBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix index 2dd596efff..6225f7c3b7 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix @@ -24,8 +24,8 @@ mkKdeDerivation { patches = [ (substituteAll { src = ./dependency-paths.patch; - dbus-send = lib.getExe' dbus "dbus-send"; - fc-match = lib.getExe' fontconfig "fc-match"; + dbusSend = lib.getExe' dbus "dbus-send"; + fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; xmessage = lib.getExe xorg.xmessage; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index d84e6dda72..561655dde2 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -46,7 +46,7 @@ index f5034455c9..8ea57813a1 100644 connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); - m_proc->start(u"fc-match"_s, args); -+ m_proc->start(u"@fc-match@"_s, args); ++ m_proc->start(u"@fcMatch@"_s, args); } void CFcQuery::procExited() @@ -143,5 +143,5 @@ index 1e903130a9..1d807a8526 100644 [Service] Type=oneshot -ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready -+ExecStart=@dbus-send@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready ++ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready Slice=session.slice diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index d99c9fd7fc..37c864f87f 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.78"; + version = "5.80"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-wMlnQiF4ejMFWJSOWe9EN91IPMgbAoXNReHgaovr+pE="; + sha256 = "sha256-UC12U2jTbYFOy3d/1DnHWXkLPdNNXuNfdIB/cbqkdiE="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + mainProgram = "xlock"; }; } diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 9cb420ae18..5dd73932e6 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -378,14 +378,14 @@ in rec { }; }; - nord = mkTmuxPlugin rec { + nord = mkTmuxPlugin { pluginName = "nord"; - version = "0.3.0"; + version = "0.3.0-unstable-2023-03-03"; src = pkgs.fetchFromGitHub { owner = "nordtheme"; repo = "tmux"; - rev = "v${version}"; - hash = "sha256-s/rimJRGXzwY9zkOp9+2bAF1XCT9FcyZJ1zuHxOBsJM="; + rev = "f7b6da07ab55fe32ee5f7d62da56d8e5ac691a92"; + hash = "sha256-mcmVYNWOUoQLiu4eM/EUudRg67Gcou13xuC6zv9aMKA="; }; meta = { homepage = "https://www.nordtheme.com/ports/tmux"; @@ -399,6 +399,7 @@ in rec { theme in order to work properly. ''; license = lib.licenses.mit; + maintainers = [ lib.maintainers.sigmasquadron ]; }; }; @@ -863,12 +864,12 @@ in rec { yank = mkTmuxPlugin { pluginName = "yank"; - version = "unstable-2021-06-20"; + version = "unstable-2023-07-19"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-yank"; - rev = "1b1a436e19f095ae8f825243dbe29800a8acd25c"; - sha256 = "hRvkBf+YrWycecnDixAsD4CAHg3KsioomfJ/nLl5Zgs="; + rev = "acfd36e4fcba99f8310a7dfb432111c242fe7392"; + sha256 = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA="; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/bartender/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/bartender/default.nix index ce38a86b5e..da9ea97764 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/bartender/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/bartender/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bartender"; - version = "5.1.8"; + version = "5.2.3"; src = fetchurl { name = "Bartender ${lib.versions.major finalAttrs.version}.dmg"; url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%20${lib.versions.major finalAttrs.version}.dmg"; - hash = "sha256-8ypSGbgnfbUv1zZlEihBjiW3UEwU8GwBT4FGiuEpLfU="; + hash = "sha256-G1XL6o5Rk/U5SsT/Q5vWaVSg0qerfzVizjFmudWAI3E="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix index b0a4c378ec..4f755d71fc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20240829"; + version = "20241019"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-QrWEvNcPKSEJghQc0tqb/L71IqeMUmuJLyA0NtzacyY="; + hash = "sha256-ZKJhGobW3F339PBsIezMTbzouomYGxDJyFbJMGIeim4="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix index 6f0cab252b..ca2da5f221 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,16 @@ { - version = "2024.2"; + version = "2024.3"; # To get these, run: # # ``` # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.2/$tool-2024.2.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.3/$tool-2024.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 # done # ``` sha256 = { - alfred = "sha256-Kpvr62fIh1n+31fRjm79qtDECPIGikYlIBfCJ8sQlnI="; - batctl = "sha256-ywKVMJP/wscA0SLAOj2eTYZ/ZG0wOPMdCpAeWP+ZXQc="; - batman-adv = "sha256-dpKm3uei8/ZnMumuyMcWTgwYGBZ/OvBjv/P/+7AZlkM="; + alfred = "sha256-1xFDOMGgZGla9x1Y3gNnenIZsHxVQpuA+G3APAJJ/+o="; + batctl = "sha256-Zl5lXto4FBUhik1fX9d/8zxPqbXtu36I6DkJaWHjYAs="; + batman-adv = "sha256-uWgX7R9PSJF8MlUKhPqtjIfs9Tqm9vRswmVUuZm1f/M="; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch deleted file mode 100644 index ae684d9be2..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 4ff06a845979bd65e672ff4ab09f5310c681e13b Mon Sep 17 00:00:00 2001 -From: Arthur Kiyanovski -Date: Tue, 30 Jul 2024 05:06:14 +0000 -Subject: [PATCH] workaround patch for kernel 6.10 - -Signed-off-by: Arthur Kiyanovski ---- - kernel/linux/ena/config/test_defs.sh | 12 ++++++++++++ - kernel/linux/ena/ena_xdp.c | 5 ++--- - kernel/linux/ena/kcompat.h | 12 +++++++++++- - 3 files changed, 25 insertions(+), 4 deletions(-) - -diff --git a/kernel/linux/ena/config/test_defs.sh b/kernel/linux/ena/config/test_defs.sh -index f8951c3..0cf366b 100755 ---- a/kernel/linux/ena/config/test_defs.sh -+++ b/kernel/linux/ena/config/test_defs.sh -@@ -60,3 +60,15 @@ try_compile_async "#include " \ - "ENA_HAVE_ETH_HW_ADDR_SET" \ - "" \ - "5.15.0 <= LINUX_VERSION_CODE" -+ -+try_compile_async "#include " \ -+ "xsk_buff_dma_sync_for_cpu(NULL);" \ -+ "ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG" \ -+ "" \ -+ "6.10.0 <= LINUX_VERSION_CODE" -+ -+try_compile_async "#include " \ -+ "__napi_alloc_skb(NULL, 0, 0);" \ -+ "ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK" \ -+ "" \ -+ "6.10.0 > LINUX_VERSION_CODE" -diff --git a/kernel/linux/ena/ena_xdp.c b/kernel/linux/ena/ena_xdp.c -index 204389f..ecbaa9f 100644 ---- a/kernel/linux/ena/ena_xdp.c -+++ b/kernel/linux/ena/ena_xdp.c -@@ -746,9 +746,8 @@ static struct sk_buff *ena_xdp_rx_skb_zc(struct ena_ring *rx_ring, struct xdp_bu - data_addr = xdp->data; - - /* allocate a skb to store the frags */ -- skb = __napi_alloc_skb(rx_ring->napi, -- headroom + data_len, -- GFP_ATOMIC | __GFP_NOWARN); -+ skb = napi_alloc_skb(rx_ring->napi, -+ headroom + data_len); - if (unlikely(!skb)) { - ena_increase_stat(&rx_ring->rx_stats.skb_alloc_fail, 1, - &rx_ring->syncp); -diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h -index 6d5a069..7511087 100644 ---- a/kernel/linux/ena/kcompat.h -+++ b/kernel/linux/ena/kcompat.h -@@ -998,10 +998,11 @@ static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2) - #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)) && \ - !(RHEL_RELEASE_CODE && \ - (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 2))) -+#define ENA_KCOMAPT_NAPI_ALLOC_SKB - static inline struct sk_buff *napi_alloc_skb(struct napi_struct *napi, - unsigned int length) - { -- return netdev_alloc_skb_ip_align(napi->dev, length); -+ return __netdev_alloc_skb_ip_align(napi->dev, length, GFP_ATOMIC | __GFP_NOWARN); - } - #endif - -@@ -1150,4 +1151,13 @@ static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumas - #define ethtool_puts ethtool_sprintf - #endif /* ENA_HAVE_ETHTOOL_PUTS */ - -+#ifdef ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG -+#include -+#define xsk_buff_dma_sync_for_cpu(xdp, xsk_pool) xsk_buff_dma_sync_for_cpu(xdp) -+#endif /* ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG */ -+ -+#if defined(ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK) && !defined(ENA_KCOMAPT_NAPI_ALLOC_SKB) -+#define napi_alloc_skb(napi, len) __napi_alloc_skb(napi, len, GFP_ATOMIC | __GFP_NOWARN) -+#endif /* ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK && !ENA_KCOMAPT_NAPI_ALLOC_SKB*/ -+ - #endif /* _KCOMPAT_H_ */ --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix index 90167977cf..6e6e5d7444 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.12.3"; + version = "2.13.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - hash = "sha256-F8vDPPwO0PnGXhqt0EeT4m/+d8w/rjMHWRV3RYC/wVQ="; + hash = "sha256-uYWKu9M/5PcHV4WdMSi0f29S7KnQft67dgjdN0AS1d8="; }; hardeningDisable = [ "pic" ]; @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - patches = [ - # https://github.com/amzn/amzn-drivers/issues/313 - ./0001-workaround-patch-for-kernel-6.10.patch - ]; - configurePhase = '' runHook preConfigure cd kernel/linux/ena diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index a3fa3f511b..a1e13be4fe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,6 +1,5 @@ { stdenvNoCC , fetchzip -, findutils , lib , python3 , rdfind @@ -13,7 +12,7 @@ let # in a perfectly pristine tree, so we can fake just enough of git to run it. gitStub = writeShellScriptBin "git" '' if [ "$1" == "ls-files" ]; then - ${lib.getExe findutils} -type f -printf "%P\n" + find -type f -printf "%P\n" else echo "Git stub called with unexpected arguments $@" >&2 exit 1 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipp-usb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipp-usb/default.nix index 38a5a28d32..0675f45aa0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipp-usb/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipp-usb/default.nix @@ -1,13 +1,13 @@ { buildGoModule, avahi, libusb1, pkg-config, lib, fetchFromGitHub, ronn }: buildGoModule rec { pname = "ipp-usb"; - version = "0.9.27"; + version = "0.9.28"; src = fetchFromGitHub { owner = "openprinting"; repo = "ipp-usb"; rev = version; - sha256 = "sha256-TBnEEH7GoOOFUh5zwJeb7c2nltaP7oCEZGnPWiK9sXk="; + sha256 = "sha256-fjhiOftiZmc9/mA/0yQuIF4/OsBuGUIpf7DLrJB3GRk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json index e4f61b03c1..7642444804 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,34 +1,34 @@ { "testing": { - "version": "6.12-rc3", - "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" + "version": "6.12-rc4", + "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" }, "6.1": { - "version": "6.1.113", - "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" + "version": "6.1.114", + "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" }, "5.15": { - "version": "5.15.168", - "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" + "version": "5.15.169", + "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" }, "5.10": { - "version": "5.10.227", - "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j" + "version": "5.10.228", + "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n" }, "5.4": { "version": "5.4.284", "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.57", - "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6" + "version": "6.6.58", + "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" }, "6.10": { "version": "6.10.14", "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" }, "6.11": { - "version": "6.11.4", - "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x" + "version": "6.11.5", + "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index 9e15991dd6..17598d74e5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -60,4 +60,14 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + # Backport upstream fix for very annoying Tailscale issue + # FIXME: remove when merged upstream + netfilter-typo-fix = { + name = "netfilter-typo-fix"; + patch = fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=306ed1728e8438caed30332e1ab46b28c25fe3d8"; + hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4="; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d2e86f876c..a369ced84c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/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.56"; - hash = "sha256-5EgCIMS6eZWPB8t6z6ts5sSHoeawja0diWuh/DNnvqw="; + version = "6.6.57"; + hash = "sha256-M12AgmaxfiBaKrZkONk7wNIJznbBhe0k1fNPIzA3ZI0="; }; main = { - version = "6.11.3"; - hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc="; + version = "6.11.4"; + hash = "sha256-wBNC3V69CbWxdNckaHCRmm0GUe5EhH//SoDvDEq48ic="; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix index da038595bd..0b9843cc4a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.8.3"; + version = "1.8.4"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - hash = "sha256-yftCaZ3mEPOreENd9Q/te/WqM7etokO+D8RZbB1epSA="; + hash = "sha256-T4NxYVJKl+2YZ6JZ7PvtM4RdTg9DIE+su4KxJwvw7iI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix index 5f8ec5529e..ebc453847a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libzbc"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbc"; rev = "v${version}"; - sha256 = "sha256-L3i3gBIfgu3mCNvCLxizwFNxBenSZsB6elCkGWdPc4Q="; + sha256 = "sha256-8+HF5Wf6lQHbi8Vp2tpom1FO56lQ5RyYsgs8ii+2RD0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix index ac4cae906a..015b38455d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.7"; + version = "1.3.8"; src = fetchgit { url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; rev = "v${version}"; - hash = "sha256-WyNng+UtfRz1+Eu4gwXLxUvBAg+m3mdrc8GdEPYRKVE="; + hash = "sha256-fOdiZcS1ZWGN8U5v65LzGIZJD6hCl5dbLMHDpSyms+8="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix index e15b17378d..bdddcacf19 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { "MANDIR=share/man/man1" ]; - setupHook = ./setup-hook.sh; - meta = with lib; { description = "Tool for controlling PaX flags on a per binary basis"; mainProgram = "paxctl"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/setup-hook.sh deleted file mode 100644 index 11a6bb9910..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -# PaX-mark binaries. -paxmark() { - local flags="$1" - shift - - paxctl -c "$@" - paxctl -zex -${flags} "$@" -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix index d63e5247dc..9269ec20d9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "vmware-modules"; - version = "workstation-17.5.1-unstable-2024-01-12-${kernel.version}"; + version = "workstation-17.6.1-unstable-2024-10-12-${kernel.version}"; src = fetchFromGitHub { - owner = "mkubecek"; + owner = "philipl"; repo = "vmware-host-modules"; # Developer no longer provides tags for kernel compatibility fixes - # Commit hash for branch workstation-17.5.1 as of 2024-03-07 - rev = "2c6d66f3f1947384038b765c897b102ecdb18298"; - hash = "sha256-VKN6nxtgQqElVrSD5++UdngjZio4+vmetGCgTAfgtTs="; + # Commit hash for branch workstation-17.6.1 as of 2024-10-15 + rev = "3a7595bddb2239c2149d7f730a4b57c8bb120d99"; + hash = "sha256-YqRnym5bOZ2ApMegOAeiUNyhsEsF5g1TVALtkUz/v6E="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/servers/authelia/sources.nix b/third_party/nixpkgs/pkgs/servers/authelia/sources.nix index 66dda07390..c9a677b41d 100644 --- a/third_party/nixpkgs/pkgs/servers/authelia/sources.nix +++ b/third_party/nixpkgs/pkgs/servers/authelia/sources.nix @@ -10,5 +10,5 @@ rec { hash = "sha256-brgA485sst/jXjdhKrhQilreCYBhESro9j/63g8qQg4="; }; vendorHash = "sha256-kSuIyL+6ue8voTzHTfnAYr9q4hUzIv/lkRopGSFaLv8="; - pnpmDepsHash = "sha256-NAn7ExVmN6Sk2hOFHfBYvbNgXPQDhkFmvF1sZeTMomE="; + pnpmDepsHash = "sha256-fufxoAL0z6bhRnBI4Gu61hBeUnyFYROmfResHJforfE="; } diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 58dbbd5cc0..8fe00f2433 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.10.2"; + version = "2024.10.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/alarmo/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/alarmo/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/alarmo/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/alarmo/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/average/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/average/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/average/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/average/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/awtrix/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/awtrix/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/awtrix/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/awtrix/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix deleted file mode 100644 index b2d958812b..0000000000 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ callPackage -}: - -{ - adaptive_lighting = callPackage ./adaptive_lighting {}; - - alarmo = callPackage ./alarmo {}; - - auth-header = callPackage ./auth-header {}; - - awtrix = callPackage ./awtrix {}; - - average = callPackage ./average {}; - - better_thermostat = callPackage ./better_thermostat {}; - - bodymiscale = callPackage ./bodymiscale { }; - - dwd = callPackage ./dwd { }; - - elevenlabs_tts = callPackage ./elevenlabs_tts {}; - - emporia_vue = callPackage ./emporia_vue {}; - - epex_spot = callPackage ./epex_spot {}; - - frigate = callPackage ./frigate {}; - - garmin_connect = callPackage ./garmin_connect {}; - - govee-lan = callPackage ./govee-lan {}; - - gpio = callPackage ./gpio {}; - - homematicip_local = callPackage ./homematicip_local { }; - - indego = callPackage ./indego { }; - - local_luftdaten = callPackage ./local_luftdaten { }; - - localtuya = callPackage ./localtuya {}; - - mass = callPackage ./mass { }; - - midea_ac = callPackage ./midea_ac { }; - - midea_ac_lan = callPackage ./midea_ac_lan {}; - - midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {}; - - miele = callPackage ./miele {}; - - moonraker = callPackage ./moonraker {}; - - nest_protect = callPackage ./nest_protect {}; - - ntfy = callPackage ./ntfy {}; - - omnik_inverter = callPackage ./omnik_inverter {}; - - prometheus_sensor = callPackage ./prometheus_sensor {}; - - samsungtv-smart = callPackage ./samsungtv-smart {}; - - sensi = callPackage ./sensi {}; - - smartir = callPackage ./smartir {}; - - smartthinq-sensors = callPackage ./smartthinq-sensors {}; - - solax_modbus = callPackage ./solax_modbus {}; - - solis-sensor = callPackage ./solis-sensor {}; - - somweb = callPackage ./somweb {}; - - spook = callPackage ./spook {}; - - tuya_local = callPackage ./tuya_local {}; - - volkswagen_we_connect_id = callPackage ./volkswagen_we_connect_id { }; - - volkswagencarnet = callPackage ./volkswagencarnet { }; - - waste_collection_schedule = callPackage ./waste_collection_schedule {}; - - xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {}; - - xiaomi_miot = callPackage ./xiaomi_miot {}; - - yassi = callPackage ./yassi {}; -} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dwd/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dwd/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dwd/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/frigate/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/frigate/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/frigate/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/gpio/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/gpio/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/gpio/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/indego/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/indego/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/indego/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/indego/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/localtuya/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/localtuya/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/localtuya/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/localtuya/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/ntfy/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/ntfy/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/ntfy/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/ntfy/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/sensi/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/sensi/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/sensi/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/sensi/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartir/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartir/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartir/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartir/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix similarity index 90% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix index 348b6aa7d2..e107d1dcd5 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "ollo69"; domain = "smartthinq_sensors"; - version = "0.40.1"; + version = "0.40.3"; src = fetchFromGitHub { inherit owner; repo = "ha-smartthinq-sensors"; rev = "v${version}"; - hash = "sha256-15s4xQKNsjrhae8Cp6U0Ay3s/o8L9BjLvc+1Tu+ss1s="; + hash = "sha256-mcxXBnVGrlVxbSi+IwmGJiWqy5PlQmHQl+hgW6i7NFc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/somweb/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/somweb/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/somweb/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/somweb/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/spook/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/spook/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/spook/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/spook/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/default.nix rename to third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix index f8fa78acf1..0595fa25ed 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-dDWdVAVrZrZIyGG9gOyLohxRZ3DGfjbvW3gGCLqZr+A="; + hash = "sha256-Aaeo3dL7N2vRTQU6bEj+jfxUAclI+8ROAUuF0PeOdw8="; }; - npmDepsHash = "sha256-UzbMDlVOef6dO+tOeTHBBeuT578brklibbfma+VVYD8="; + npmDepsHash = "sha256-unTZvllmfEBXWgEbObJWMPpEJzgrihKKK1eMREWpbVE="; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index d515a1839b..edd4f6ad79 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-ze+bsQbPeqfcZ2pWrI4aH3a1+uxus6wC2G9D+uVMrMU="; + hash = "sha256-h7U39dpgEsTboYjfpWxcdP3BkXNB2dQNuSiTCD7zPR0="; }; patches = [ ./dont-call-git.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 6fc00b593a..94b9758dcc 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/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.10.2"; + hassVersion = "2024.10.3"; 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-YHK6SJJok1FGtFfD2C2QFCtWzNK1ZiOGZe/kbQFkMvU="; + hash = "sha256-kxxa7FI2wIpE3bEifNyjtEHj7rsuImQvxGd6I46ySqM="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-mVKokL6EcvLMvOEKIw1dlEQeXaxMLO8ExMOzw6r1eCs="; + hash = "sha256-DhDdCvov5/Yf2MnY2veV8W/lYk3LTDzxYpbAsbjxWcg="; }; build-system = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index edf1943006..2bf5cc37a4 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.0.0"; + version = "26.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-BWkF5iiR4J7NskrJUFmlP0N+HEkyZLnLJbMmbXCROxo="; + hash = "sha256-8dA38Xjvr5+LqyD222mOg8RIhw3gFbilPgVxlrdiCq4="; }; nativeBuildInputs = [ makeWrapper jre ]; @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { mkdir $out cp -r * $out - rm $out/bin/*.{ps1,bat} + rm $out/bin/*.{ps1,bat,orig} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix index 429393553e..10ca3b991b 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4g7r68h30iw7spypc7hvvd7w1vx05mysmijdy6vkr947hxyhw4"; + sha256 = "1mfb5x6kwxwprprhzj2a1hff7vw37v1wd9hl70nqq23xr82w20wx"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzkwsc7k43v5irpydrzrh4v9dmwikj9xcdafz21kvwh8903pgih"; + sha256 = "1z95jcq4cmk7zzy4jjgxjbigk0zaxm2gpf8p0s0jn3b5px0k3ljk"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09abzaywpzwnbkpdn8g340pi584k8lpcqzi63m7wahyyyairdqza"; + sha256 = "1h39ffp0zs0r46bfm8bbgvc8icwamq4icsf1qn32xskdssnb8xyr"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c72nzrs3jjag7xbawy8hzzxggmpfp4r23y6viril2xzxffqgy7m"; + sha256 = "1mrdaql56iqnqcg7n3frc0r48bca8b4g9f2ifc69f15dpps2wfsx"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lvvaq994hihwb63jvdxbq03i5wgfk6llkibzsq1v0csphby1sx"; + sha256 = "06az0qalnvz0hv1wq8nn5q70gak9r50b6b95avmkz860lhbpx70d"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrrb4r6p2wrdbjphkkd482h10hri77d1aj1ddhz3ynvbrkg0ay0"; + sha256 = "02zrp7x6k6sgd4rrpsh2b9k2h0qhx538fsb1grsw25ss8d9k2b2j"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhb7hy7dxx5qy8hahdf2gpr65n0xisxrfapzd2g8czb59ammxk5"; + sha256 = "1r0i34jrsibwkbg61kjm1xjbc8ppy8r91bnach8rv7jgjrid4dyl"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhhsiv2hk1jfqdxx9qqlmzhvshqjs9kqh13gl1jyzfhzmd0b38q"; + sha256 = "1dpdfa132zsfw5l754p2iwialbscvhp9dblq9fg65ww306s3g0pl"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "timeout"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9cch94h3wj71mldyk85657r4cpr9p3z55bwxqvpiby2fn6svc3"; + sha256 = "1cwx0a7pbl2shm0jc0m7aylacb84j2p4f3h0v7f6aas2b8s6lkf1"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihbywjdp57mcnbx2150rpsx79f3pfv313d1zwsz0qwmzdcvpsr3"; + sha256 = "07zw4r8n3ag3d8jfynngpk0cxjwwlh7pxg3hrz1fdww2fnl6nan8"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activesupport = { dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm2v3zkr58ljr1fswf67lkm8zwxr100qfdaxzzv46jlwmy1m3is"; + sha256 = "0p3167vw7csidyfl731hbp27xaz90w0v31l3fqzrsipci69p7qw0"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -2550,10 +2550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07n5ijqxlp4jkd29s9v9b7p9rnspi7pffn4rp4h07dvds9w9xkyz"; + sha256 = "0fa7maxd1ydbnws0fym43pv8j2c6k5dkg0z0fkq31j8jr1aqk7ja"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2605,10 +2605,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njacgg01934sd942byyjkcyy3iwidysdbhp8kjrjrinackmyfal"; + sha256 = "0ypihpilhxdz5p3sb5g37jn2sbfjhf2ydkxj097kkn7ri7a7702x"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; rainbow = { groups = ["default" "development"]; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix index 9c27b1ee32..9d7ac7df23 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.3.0"; + version = "4.3.1"; in ( applyPatches { @@ -9,10 +9,10 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-nZtxildQmT/7JMCTx89ZSWxb9I7xMLGHTJv7v4gfdd4="; + hash = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4="; }; patches = patches ++ []; }) // { inherit version; - yarnHash = "sha256-V/kBkxv6akTyzlFzdR1F53b7RD0NYtap58Xt5yOAbYA="; + yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix deleted file mode 100644 index 4774ea410a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "matrix-sliding-sync"; - version = "0.99.19"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "sliding-sync"; - rev = "refs/tags/v${version}"; - hash = "sha256-w4VL+MioNeJ/R48Ln9tYaqlfg7NvT3mQs0dWOZTHQK4="; - }; - - vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; - - subPackages = [ "cmd/syncv3" ]; - - ldflags = [ - "-s" - "-w" - "-X main.GitCommit=${src.rev}" - ]; - - # requires a running matrix-synapse - doCheck = false; - - meta = with lib; { - description = "Sliding sync implementation of MSC3575 for matrix"; - homepage = "https://github.com/matrix-org/sliding-sync"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ emilylange yayayayaka ]; - mainProgram = "syncv3"; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index b66dad00da..5c13215e2a 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -13,19 +13,19 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.9"; + version = "0.11.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4="; + hash = "sha256-D9ed2/3ymUmZotnD8AZngPGQtzr8+R7xfbcdQLb3EKU="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk="; + vendorHash = "sha256-qd8dGJe3h6JG6B9pZbJXHk3NwYddfHXzprSH20jn9Bk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 0c949ed7ce..833553b24e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.11.5"; + version = "3.11.6"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-ARrK6eL5G/IdJ4AgcpgyfCNA0cDBdj4bM1elFuXDCmM="; + hash = "sha256-jHACiSTZHNHj61kN8zEjGb3NpkhRJrJ7Mp0pNmJXDXY="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-+WxZ5gJgRBhKy9igkw8r/J7r1R/L/EYL3AGjCuwmMb0="; + hash = "sha256-h4i27yNnVU+h5/oboAq6S4+dqjkvJ6TFqtljM3ffgTI="; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json index 48e49521f9..e662b6b464 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -30,8 +30,8 @@ "@hapi/boom": "^10.0.0", "@puppeteer/browsers": "^2.3.1", "chokidar": "^3.5.2", - "dompurify": "^2.4.0", - "express": "^4.21.0", + "dompurify": "^2.5.4", + "express": "^4.21.1", "express-prom-bundle": "^6.5.0", "jimp": "^0.22.12", "jsdom": "20.0.0", diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index b371008dc0..09b9d1be1c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-ZF5mBjq+IhSQrQ1dUfHlfyUMK2dkpZ5gu9djPkUYvRQ="; + hash = "sha256-0JNt3XbXGbAfaBQ13X/vrBhhN39hY4kwoBQ9obxsAd0="; }; - vendorHash = "sha256-q5MFAvFCrr24b1VO0Z03C08CGd+0pUerXZEKiu4r7cE="; + vendorHash = "sha256-dUf++LhoKWJxQfu9Latr8mCkeid5EAi+6yRdWDkTeP8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index 5df77a2654..f2811a8c53 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-2/oYfeybXnaoccyhriCHEY5lZcojLnk9qoiSlt4TDZY="; + hash = "sha256-d2/N/NqtRglRN/3E7B5FOMpcQXP/taKFYodc6mhW7A4="; }; - vendorHash = "sha256-xKqt4JdHbFxMvFMa/zi8qGm9OZ3YFjGJQrMXfBfj4xA="; + vendorHash = "sha256-hy2w1Ix202gSJyp/EQ6uKJC8y16nw8Y78kDaP9LbU/4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix index 5404153c07..7b80f8d323 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "process-exporter"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "ncabatoff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E14TaxNQ0P/cgs8ZRZ5wxxsdJaXeb7grO+pNaGhz00s="; + sha256 = "sha256-l767shpUFTLJV3yd9MhG5h7QTIKonwCPDW4PYQ2lTcg="; }; vendorHash = "sha256-Mmcc7Tp71OH5BQgMYMRhokqNDOqCudaUaCNzjOGoQ68="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 1ebd2be3c4..c0dd2e133f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kNIf8HwqNPGJAR8+/IkGn/5ryMEd6rGCixjnKG63xcY="; + sha256 = "sha256-9e3prTe7mHQJfSeIL+bEkW6GykvxA8ryD3GHgxk56Us="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 83cd922bc5..99bc3be76f 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,7 +13,6 @@ , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , uthash -, fetchpatch , nixosTests }: @@ -30,24 +29,15 @@ let in stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.18"; + version = "2.0.20"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - hash = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; + hash = "sha256-oZo6J6mxMC05jJ8RXIunOMB3kptA6FElchKlg4qmuQ8="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - (fetchpatch { - name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 - url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; - sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069"; - revert = true; - }) - ]; - postPatch = '' for f in html manpage ; do substituteInPlace man/$f.xsl \ diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 6bec9a2d82..f43c3c1ea2 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.21"; + version = "2.10.22"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-d2ko6ejSdGDeroWIELrCBQjYYSobWp4R4XC58eN50xs="; + hash = "sha256-B+fSB3aTXAc/EjKSaFR2clieLNFszA2U2BdMsYJRZFE="; }; - vendorHash = "sha256-RmVDlboqwujTy8SVSwUu8mesSUmkNERi/sYQH7WAUUI="; + vendorHash = "sha256-0VkY1+3tlAfGDt+fhyMbmyT4TN0bw1HVJLi2+mivkrc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index a63ee485fe..3468ae8b5a 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -71,8 +71,8 @@ in }; nextcloud30 = generic { - version = "30.0.0"; - hash = "sha256-GNeoCVe7U+lPsESS9rUhNDTdo+naEtn3iZl2h8hWTmA="; + version = "30.0.1"; + hash = "sha256-eewv+tYjG9j8xKuqzBLlrFHmcNCJr/s3lINZLNoP3Ms="; packages = nextcloud30Packages; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json index ef62ba34d4..aa86bf6ef4 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", - "version": "4.3.1", + "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", + "version": "4.3.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "hash": "sha256-PaDPYHUzkqY24Hzpi4e3DkvT32f+WYmx7WUNRevqIh8=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.10/groupfolders-v16.0.10.tar.gz", - "version": "16.0.10", + "hash": "sha256-Plgmnp3fIzvHVcy8+wEmjNHegHqBeUtcbsRA/PHEAlc=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.11/groupfolders-v16.0.11.tar.gz", + "version": "16.0.11", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", - "version": "3.7.8", + "hash": "sha256-Y591RR3m4k8G0+sNU+hRN013LikCFJ/41SbrILEfp8A=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.9/mail-v3.7.9.tar.gz", + "version": "3.7.9", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-nk5l9naHHBmpZe0oNzRNuYchbOl2asPgoRaM1vQ3CLc=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.11/richdocuments-v8.3.11.tar.gz", - "version": "8.3.11", + "hash": "sha256-MD6zuKfGdDeItmgO9NxJogUCgVS/8b5w/TZh9mPTQno=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.12/richdocuments-v8.3.12.tar.gz", + "version": "8.3.12", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz", + "version": "6.1.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ @@ -338,5 +338,15 @@ "licenses": [ "agpl" ] + }, + "whiteboard": { + "hash": "sha256-3Q0B4nAVoerolDlBmjp0KwTWXLzETPrrZxnmfSDF5Gk=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.4/whiteboard-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", + "homepage": "https://github.com/nextcloud/whiteboard", + "licenses": [ + "agpl" + ] } } diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json index 52a805aed8..b1547ac6fe 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", - "version": "4.3.1", + "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", + "version": "4.3.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "hash": "sha256-3CG5lp1lcPzcvOjcQIFcP8OVZvWCq3iNf4OUCu3X7t8=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.4/groupfolders-v17.0.4.tar.gz", - "version": "17.0.4", + "hash": "sha256-/pREdGW7kM2imVx6Jk5iZ9odQpk/93AwkFECVPJhyuI=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.5/groupfolders-v17.0.5.tar.gz", + "version": "17.0.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", - "version": "3.7.8", + "hash": "sha256-Y591RR3m4k8G0+sNU+hRN013LikCFJ/41SbrILEfp8A=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.9/mail-v3.7.9.tar.gz", + "version": "3.7.9", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -140,8 +140,8 @@ ] }, "maps": { - "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", + "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-fcKzfo8tyYiZTwqMnR6vP+dTwTYt1UfBZG8ortPDCNg=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.7/richdocuments-v8.4.7.tar.gz", - "version": "8.4.7", + "hash": "sha256-oRk06JoOvHUD4D7htl/B+CyCz9ybSIAZCELxV3v4uCU=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.8/richdocuments-v8.4.8.tar.gz", + "version": "8.4.8", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz", + "version": "6.1.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ @@ -338,5 +338,15 @@ "licenses": [ "agpl" ] + }, + "whiteboard": { + "hash": "sha256-3Q0B4nAVoerolDlBmjp0KwTWXLzETPrrZxnmfSDF5Gk=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.4/whiteboard-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", + "homepage": "https://github.com/nextcloud/whiteboard", + "licenses": [ + "agpl" + ] } } diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json index 8d32cb8e59..3c87426cdd 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-mlxW7ALSUr3t7fd4H/TDWASzsSlPKojOLh76v8wd1w0=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.0/calendar-v5.0.0.tar.gz", - "version": "5.0.0", + "hash": "sha256-v9qjcyc2UBZK7QeO1XBZu11coPI92PRZcTipzBEMm3c=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.1/calendar-v5.0.1.tar.gz", + "version": "5.0.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", - "version": "4.3.1", + "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", + "version": "4.3.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "hash": "sha256-jSDp8+s0bqYHMZ95UaiAMkMQdYL7tmdbde5mLG6gLOk=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.2/groupfolders-v18.0.2.tar.gz", - "version": "18.0.2", + "hash": "sha256-IrxzWjxqsA6prPn/gKj9MAw0R/1Qi3kHsddNU5E9sVk=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.3/groupfolders-v18.0.3.tar.gz", + "version": "18.0.3", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-u0h9zCT/l9cUUFppKazx4oLkHYzlgGcb0OBOy1CXOG8=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.1/mail-v4.0.1.tar.gz", - "version": "4.0.1", + "hash": "sha256-iCK+B/BP4fCzaELNxL/A9OJ6Y34gZl9KIgh7lmSgtSA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.2/mail-v4.0.2.tar.gz", + "version": "4.0.2", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -240,9 +240,9 @@ ] }, "richdocuments": { - "hash": "sha256-sM536BlvbNNrGL++ZQItvnOBk+85Hr1Sxr6/0SZTm+g=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.1/richdocuments-v8.5.1.tar.gz", - "version": "8.5.1", + "hash": "sha256-7sdMClIyQxeCToP40mKDzD4kY/wjSe8WyNl2dlis1a8=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.2/richdocuments-v8.5.2.tar.gz", + "version": "8.5.2", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -290,9 +290,9 @@ ] }, "user_oidc": { - "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz", + "version": "6.1.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ @@ -308,5 +308,15 @@ "licenses": [ "agpl" ] + }, + "whiteboard": { + "hash": "sha256-3Q0B4nAVoerolDlBmjp0KwTWXLzETPrrZxnmfSDF5Gk=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.4/whiteboard-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", + "homepage": "https://github.com/nextcloud/whiteboard", + "licenses": [ + "agpl" + ] } } diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 3118d4418c..b9c1d62316 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -37,4 +37,5 @@ , "unsplash": "agpl3Only" , "user_oidc": "agpl3Plus" , "user_saml": "agpl3Plus" +, "whiteboard": "agpl3Plus" } diff --git a/third_party/nixpkgs/pkgs/servers/pleroma/default.nix b/third_party/nixpkgs/pkgs/servers/pleroma/default.nix index 565fb8ad52..88b0f14741 100644 --- a/third_party/nixpkgs/pkgs/servers/pleroma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pleroma/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, beamPackages, fetchFromGitHub, fetchFromGitLab, @@ -11,6 +12,7 @@ vips, pkg-config, glib, + darwin, ... }: @@ -91,10 +93,16 @@ beamPackages.mixRelease rec { vix = prev.vix.override { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - vips - glib.dev - ]; + buildInputs = + [ + vips + glib.dev + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Kerberos + ]; VIX_COMPILATION_MODE = "PLATFORM_PROVIDED_LIBVIPS"; }; diff --git a/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock b/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock index 51df0ea7bb..e6cf59d4ca 100644 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock @@ -36,18 +36,18 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", - "ahash", + "ahash 0.8.11", "base64 0.22.1", - "bitflags 2.5.0", + "bitflags 2.6.0", "brotli", "bytes", "bytestring", @@ -55,7 +55,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.11", "httparse", "httpdate", @@ -92,7 +92,6 @@ dependencies = [ "bytestring", "cfg-if", "http 0.2.11", - "regex", "regex-lite", "serde", "tracing", @@ -100,9 +99,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "actix-macros", "futures-core", @@ -150,11 +149,11 @@ dependencies = [ "futures-core", "impl-more", "pin-project-lite", + "rustls-pki-types", "tokio", "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.25.3", ] [[package]] @@ -169,9 +168,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.6.0" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -183,7 +182,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash", + "ahash 0.8.11", "bytes", "bytestring", "cfg-if", @@ -210,26 +209,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "actix-web-static-files" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f" -dependencies = [ - "actix-web", - "derive_more", - "futures-util", - "static-files", + "syn 2.0.60", ] [[package]] @@ -258,6 +245,17 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "ahash" version = "0.8.11" @@ -265,6 +263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom", "once_cell", "version_check", @@ -273,9 +272,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -357,9 +356,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -379,6 +378,12 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "arroy" version = "0.4.0" @@ -389,7 +394,7 @@ dependencies = [ "byteorder", "heed", "log", - "memmap2 0.9.4", + "memmap2", "ordered-float", "rand", "rayon", @@ -408,33 +413,11 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -442,19 +425,10 @@ dependencies = [ ] [[package]] -name = "atomic" -version = "0.5.3" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -495,15 +469,9 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "benchmarks" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "bytes", @@ -546,16 +514,16 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", @@ -598,13 +566,25 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] +[[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-buffer" version = "0.10.4" @@ -614,6 +594,30 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[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", + "proc-macro2", + "quote", + "syn 2.0.60", + "syn_derive", +] + [[package]] name = "brotli" version = "6.0.0" @@ -637,9 +641,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -648,7 +652,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "time", @@ -657,20 +661,43 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "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 = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "bytecount" version = "0.6.3" @@ -705,9 +732,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -750,16 +777,16 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1b20174c1707e20f4cb364a355b449803c03e9b0c9193324623cf9787a4e00" +checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" dependencies = [ "byteorder", "candle-kernels", "cudarc", "gemm", "half 2.4.0", - "memmap2 0.9.4", + "memmap2", "num-traits", "num_cpus", "rand", @@ -768,23 +795,23 @@ dependencies = [ "safetensors", "thiserror", "yoke", - "zip", + "zip 1.1.4", ] [[package]] name = "candle-kernels" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5845911a44164ebb73b56a0e23793ba1b583bad102af7400fe4768babc5815b2" +checksum = "8bc0a71be8b2f0950b63fd602a5e10a74a4f94a5fd63059ae455e96163389488" dependencies = [ "bindgen_cuda", ] [[package]] name = "candle-nn" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a27533c8edfc915a6459f9850641ef523a829fa1a181c670766c1f752d873a" +checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" dependencies = [ "candle-core", "half 2.4.0", @@ -797,13 +824,14 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5847699f0643da05e57fc473672566e93dc36d82c1b7eeb970c6154d3434fe1" +checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" dependencies = [ "byteorder", "candle-core", "candle-nn", + "fancy-regex 0.13.0", "num-traits", "rand", "rayon", @@ -838,9 +866,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.18.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" +checksum = "4895c018bb228aa6b3ba1a0285543fcb4b704734c3fb1f72afaa75aa769500c1" dependencies = [ "serde", "toml", @@ -854,12 +882,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -886,6 +915,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "change-detection" version = "1.2.0" @@ -898,20 +933,17 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.11" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a09ae38cfcc153f01576c3f579dfd916e0320f1b474f298c8d680b2dd92eb6" +checksum = "55ff52497324e7d168505a16949ae836c14595606fab94687238d2f6c8d4c798" dependencies = [ "aho-corasick", - "cow-utils", "csv", - "deunicode", "either", "fst", "irg-kvariants", "jieba-rs", "lindera", - "litemap", "once_cell", "pinyin", "serde", @@ -919,7 +951,6 @@ dependencies = [ "unicode-normalization", "wana_kana", "whatlang", - "zerovec", ] [[package]] @@ -972,9 +1003,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.17" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -982,23 +1013,23 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.17" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.60", @@ -1006,9 +1037,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "color-spantrace" @@ -1053,10 +1084,30 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-random" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -1084,28 +1135,12 @@ dependencies = [ "version_check", ] -[[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 = "cow-utils" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" - [[package]] name = "cpufeatures" version = "0.2.12" @@ -1116,10 +1151,25 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.4.0" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1160,12 +1210,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - [[package]] name = "crossbeam" version = "0.8.4" @@ -1181,9 +1225,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1218,9 +1262,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1261,11 +1305,12 @@ dependencies = [ [[package]] name = "cudarc" -version = "0.10.0" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9395df0cab995685664e79cc35ad6302bf08fb9c5d82301875a183affe1278b1" +checksum = "56ee2a3fbbd981e1c7ea73cc2af136e754eb22d17436de37155227ee4dbe0cf4" dependencies = [ "half 2.4.0", + "libloading", ] [[package]] @@ -1338,6 +1383,24 @@ dependencies = [ "syn 2.0.60", ] +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + [[package]] name = "debugid" version = "0.8.0" @@ -1347,6 +1410,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deranged" version = "0.3.11" @@ -1377,15 +1446,6 @@ dependencies = [ "derive_builder_macro 0.12.0", ] -[[package]] -name = "derive_builder" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f59169f400d8087f238c5c0c7db6a28af18681717f3b623227d92f397e938c7" -dependencies = [ - "derive_builder_macro 0.13.1", -] - [[package]] name = "derive_builder" version = "0.20.0" @@ -1407,18 +1467,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_core" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ec317cc3e7ef0928b0ca6e4a634a4d6c001672ae210438cf114a83e56b018d" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_builder_core" version = "0.20.0" @@ -1441,16 +1489,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_macro" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870368c3fb35b8031abb378861d4460f573b92238ec2152c927a21f77e3e0127" -dependencies = [ - "derive_builder_core 0.13.1", - "syn 1.0.109", -] - [[package]] name = "derive_builder_macro" version = "0.20.0" @@ -1476,9 +1514,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418e814bb893a61b25a60db71dccab7cb70035d94ffe58c9b4a70387ac42083" +checksum = "bfe971a2a48625fda3198032f35de60939828c4aed47d76715c21698801b985c" dependencies = [ "actix-http", "actix-utils", @@ -1488,14 +1526,14 @@ dependencies = [ "serde-cs", "serde_json", "serde_urlencoded", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "deserr-internal" -version = "0.7.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadd9624c995ecbd6d6c81ec0804fbbb335e3acba5326a06067ccd33295a37e" +checksum = "aae89f00c97a75940185084a826c0aace055774ad57a58211625606449ea0bd8" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -1503,12 +1541,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "deunicode" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" - [[package]] name = "digest" version = "0.10.7" @@ -1562,6 +1594,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1579,15 +1622,14 @@ dependencies = [ [[package]] name = "dump" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.11", + "http 1.1.0", "maplit", "meili-snap", - "meilisearch-auth", "meilisearch-types", "once_cell", "regex", @@ -1614,9 +1656,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1715,7 +1757,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.60", @@ -1723,18 +1765,18 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.5.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" +checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", @@ -1773,40 +1815,27 @@ dependencies = [ "regex", ] +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "faux" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b55a7f424e532314115b5cdc6d9711b15ac453bfe0dcfa212baebc5efacd60" -dependencies = [ - "faux_macros", - "paste", -] - -[[package]] -name = "faux_macros" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15473d7f83b54a44826907af16ae5727eaacaf6e53b51474016d3efd9aa35d5" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.60", - "uuid", -] +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "file-store" -version = "1.9.0" +version = "1.10.2" dependencies = [ - "faux", "tempfile", "thiserror", "tracing", @@ -1827,7 +1856,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.9.0" +version = "1.10.2" dependencies = [ "insta", "nom", @@ -1837,9 +1866,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1847,7 +1876,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.9.0" +version = "1.10.2" dependencies = [ "criterion", "serde_json", @@ -1874,6 +1903,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.3.30" @@ -1965,7 +2000,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.9.0" +version = "1.10.2" dependencies = [ "arbitrary", "clap", @@ -1987,14 +2022,15 @@ dependencies = [ [[package]] name = "fxprof-processed-profile" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +checksum = "ce20bbb48248608ba4908b45fe36e17e40f56f8c6bb385ecf5d3c4a1e8b05a22" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", + "serde_derive", "serde_json", ] @@ -2165,11 +2201,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -2184,9 +2220,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "grenad" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c297f45167e6d543eb728e12ff284283e4ba2182a25c6cdcec883fda3316c7e7" +checksum = "350d89047298d3b1b40050acd11ab76e487b854a104b760ebc5a7f375093de77" dependencies = [ "bytemuck", "byteorder", @@ -2213,6 +2249,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -2235,33 +2290,39 @@ dependencies = [ [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash", + "ahash 0.8.11", "allocator-api2", ] [[package]] name = "heapless" -version = "0.7.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version", - "spin", "stable_deref_trait", ] @@ -2272,19 +2333,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "heed" -version = "0.20.2" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60d7cff16094be9627830b399c087a25017e93fb3768b87cd656a68ccb1ebe8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "heed" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "heed-traits", "heed-types", "libc", "lmdb-master-sys", "once_cell", - "page_size 0.6.0", + "page_size", "synchronoise", "url", ] @@ -2297,9 +2364,9 @@ checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" [[package]] name = "heed-types" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3" +checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114" dependencies = [ "bincode", "byteorder", @@ -2326,7 +2393,7 @@ version = "0.3.2" source = "git+https://github.com/dureuill/hf-hub.git?branch=rust_tls#88d4f11cb9fa079f2912bacb96f5080b16825ce8" dependencies = [ "dirs", - "http 1.0.0", + "http 1.1.0", "indicatif", "log", "rand", @@ -2358,9 +2425,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2369,12 +2436,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 0.2.11", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body", "pin-project-lite", ] @@ -2392,40 +2471,61 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.27" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http 0.2.11", + "h2 0.4.5", + "http 1.1.0", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 0.2.11", + "http 1.1.0", "hyper", - "rustls 0.21.12", + "hyper-util", + "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2452,7 +2552,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "arroy", @@ -2460,7 +2560,7 @@ dependencies = [ "bincode", "crossbeam", "csv", - "derive_builder 0.12.0", + "derive_builder 0.20.0", "dump", "enum-iterator", "file-store", @@ -2470,7 +2570,7 @@ dependencies = [ "meili-snap", "meilisearch-auth", "meilisearch-types", - "page_size 0.5.0", + "page_size", "rayon", "roaring", "serde", @@ -2491,7 +2591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", "serde", ] @@ -2519,9 +2619,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -2530,7 +2630,6 @@ dependencies = [ "pest_derive", "serde", "similar", - "yaml-rust", ] [[package]] @@ -2542,17 +2641,6 @@ dependencies = [ "cfg-if", ] -[[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.8.0" @@ -2561,9 +2649,9 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "irg-kvariants" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73214298363629cf9dbfc93b426808865ee3c121029778cb31b1284104fdf78" +checksum = "ef2af7c331f2536964a32b78a7d2e0963d78b42f4a76323b16cc7d94b1ddce26" dependencies = [ "csv", "once_cell", @@ -2572,12 +2660,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix 0.38.31", + "libc", "windows-sys 0.52.0", ] @@ -2608,6 +2696,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2616,13 +2713,13 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jieba-rs" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" +checksum = "c1e2b0210dc78b49337af9e49d7ae41a39dceac6e5985613f1cf7763e2f76a25" dependencies = [ "cedarwood", + "derive_builder 0.20.0", "fxhash", - "hashbrown", "lazy_static", "phf", "phf_codegen", @@ -2631,9 +2728,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2649,7 +2746,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.9.0" +version = "1.10.2" dependencies = [ "criterion", "serde_json", @@ -2657,9 +2754,9 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.2.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.7", "js-sys", @@ -2697,9 +2794,9 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[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 = "lazycell" @@ -2718,15 +2815,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -2736,12 +2833,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -2752,9 +2849,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2762,9 +2859,9 @@ dependencies = [ [[package]] name = "libproc" -version = "0.14.2" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229004ebba9d1d5caf41623f1523b6d52abb47d9f6ab87f7e6fc992e3b854aef" +checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb" dependencies = [ "bindgen", "errno", @@ -2785,9 +2882,9 @@ dependencies = [ [[package]] name = "lindera" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd4fa369654517f72c10b24adf03ad4ce69d19facb79c3cb3cf9b4580ac352f" +checksum = "c6cbc1aad631a7da0a7e9bc4b8669fa92ac9ca8eeb7b35a807376dd3034443ff" dependencies = [ "lindera-analyzer", "lindera-core", @@ -2798,9 +2895,9 @@ dependencies = [ [[package]] name = "lindera-analyzer" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cba7fe275cb8ec4c594cfee9cc39e48b71e02a089457d52f3e70dc146a8133" +checksum = "74508ffbb24e36905d1718b261460e378a748029b07bcd7e06f0d18500b8194c" dependencies = [ "anyhow", "bincode", @@ -2827,10 +2924,23 @@ dependencies = [ ] [[package]] -name = "lindera-cc-cedict" -version = "0.31.0" +name = "lindera-assets" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240adf9faba3f09ad16557aefcd316dd00ebb940ac94334a629660d772f118c1" +checksum = "6a677c371ecb3bd02b751be306ea09876cd47cf426303ad5f10a3fd6f9a4ded6" +dependencies = [ + "encoding", + "flate2", + "lindera-core", + "tar", + "ureq", +] + +[[package]] +name = "lindera-cc-cedict" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35944000d05a177e981f037b5f0805f283b32f05a0c35713003bef136ca8cb4" dependencies = [ "bincode", "byteorder", @@ -2842,9 +2952,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12241f9e74babe708a0b9441d9f3fa67cb29fd01257918f30ffd480ca568820" +checksum = "85b8f642bc9c9130682569975772a17336c6aab26d11fc0f823f3e663167ace6" dependencies = [ "anyhow", "lindera-core", @@ -2854,9 +2964,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f9f7a858d70ff9e4383cbd507ca9e98c8faf0319e08c10df4c30cb58c9ca6c" +checksum = "a7825d8d63592aa5727d67bd209170ac82df56c369533efbf0ddbac277bb68ec" dependencies = [ "anyhow", "flate2", @@ -2865,9 +2975,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f09810ab98ce2a084d788ac38fbb7b31697f34bc47c61de0d880320a674bd15" +checksum = "0c28191456debc98af6aa5f7db77872471983e9fa2a737b1c232b6ef543aed62" dependencies = [ "anyhow", "bincode", @@ -2882,9 +2992,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53400c9b2dd6b45f82d9fa5b5efe079f3acaf6ce609dba8d42c8a76baaa2b12" +checksum = "4788a1ead2f63f3fc2888109272921dedd86a87b7d0bf05e9daab46600daac51" dependencies = [ "anyhow", "flate2", @@ -2893,9 +3003,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2053d064a515839250438b8dfa6cf445e2b97633232ded34a54f267e945d196e" +checksum = "bdf5f91725e32b9a21b1656baa7030766c9bafc4de4b4ddeb8ffdde7224dd2f6" dependencies = [ "anyhow", "bincode", @@ -2918,9 +3028,9 @@ dependencies = [ [[package]] name = "lindera-dictionary-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f486924055f8bedcc5877572e4dc91fbc10370862430ac2e5f7f0d671a18c8" +checksum = "e41f00ba7ac541b0ffd8c30e7a73f2dd197546cc5780462ec4f2e4782945a780" dependencies = [ "anyhow", "bincode", @@ -2940,9 +3050,9 @@ dependencies = [ [[package]] name = "lindera-filter" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3904fc279f0297f6fd6210435adab1f8c82ba84eba8635407c791af51c0d8a" +checksum = "273d27e01e1377e2647314a4a5b9bdca4b52a867b319069ebae8c10191146eca" dependencies = [ "anyhow", "csv", @@ -2965,9 +3075,9 @@ dependencies = [ [[package]] name = "lindera-ipadic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa3ef2f1f6838b0fa2e2fca2896242bb83bc877c1760cdb6fa23449ab95d664" +checksum = "b97a52ff0af5acb700093badaf7078051ab9ffd9071859724445a60193995f1f" dependencies = [ "bincode", "byteorder", @@ -2979,9 +3089,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41287db18eadb58d73a04d49778d41c161549fbbbe155d4338976b7b8541c7d" +checksum = "bf5031c52686128db13f774b2c5a8abfd52b4cc1f904041d8411aa19d630ce4d" dependencies = [ "anyhow", "lindera-core", @@ -2991,9 +3101,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49382256f245078400bf7e72663f9eb30afcd9ed54cd46f29d7db1be529678e1" +checksum = "d6b36764b27b169aa11d24888141f206a6c246a5b195c1e67127485bac512fb6" dependencies = [ "bincode", "byteorder", @@ -3005,9 +3115,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9cfd2fda68ef526ef0c7b50c5d4d5582a4daa6ecd0cea9e2b0b62564a2a5d" +checksum = "abf36e40ace904741efdd883ed5c4dba6425f65156a0fb5d3f73a386335950dc" dependencies = [ "anyhow", "lindera-core", @@ -3017,27 +3127,24 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f86d03a863f3ae1d269e7b7d4dd2cce9385a53463479bafc5d7aa48719f36db" +checksum = "4c92a1a3564b531953f0238cbcea392f2905f7b27b449978cf9e702a80e1086d" dependencies = [ "bincode", "byteorder", - "encoding", - "flate2", + "lindera-assets", "lindera-core", "lindera-decompress", "lindera-ko-dic-builder", "once_cell", - "tar", - "ureq", ] [[package]] name = "lindera-ko-dic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0f44f2e56358c5879dfb5e7f76cc6ba7853ec31082c4e3f8fb65fb2d849c51" +checksum = "9f2c60425abc1548570c2568858f74a1f042105ecd89faa39c651b4315350fd9" dependencies = [ "anyhow", "lindera-core", @@ -3047,9 +3154,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5182735cdc2832ac757b31e8a5b150a3514357a30efe3dec212f8dcb06ba14" +checksum = "903e558981bcb6f59870aa7d6b4bcb09e8f7db778886a6a70f67fd74c9fa2ca3" dependencies = [ "bincode", "lindera-core", @@ -3061,27 +3168,24 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c63da104728dd1cf14bfa564753cbfa996f6078ed2e23e31475bd1d639fc597" +checksum = "d227c3ce9cbd905f865c46c65a0470fd04e89b71104d7f92baa71a212ffe1d4b" dependencies = [ "bincode", "byteorder", - "encoding", - "flate2", + "lindera-assets", "lindera-core", "lindera-decompress", "lindera-unidic-builder", "once_cell", - "tar", - "ureq", ] [[package]] name = "lindera-unidic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04acecbc068dac21766a1b7ed1f2608b6f250d10b4f8bff67abc2a00437a0974" +checksum = "99e2c50015c242e02c451acb6748667ac6fd1d3d667cd7db48cd89e2f2d2377e" dependencies = [ "anyhow", "lindera-core", @@ -3095,12 +3199,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - [[package]] name = "linux-raw-sys" version = "0.4.12" @@ -3109,9 +3207,9 @@ checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "liquid" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f68ae1011499ae2ef879f631891f21c78e309755f4a5e483c4a8f12e10b609" +checksum = "10929f201279ba14da3297b957dcda1e0bf7a6f3bb5115688be684aa8864e9cc" dependencies = [ "doc-comment", "liquid-core", @@ -3122,12 +3220,12 @@ dependencies = [ [[package]] name = "liquid-core" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e0724dfcaad5cfb7965ea0f178ca0870b8d7315178f4a7179f5696f7f04d5f" +checksum = "3aef4b2160791f456eb880c990a97746f693746f92302ef5f1d06111cf14b768" dependencies = [ "anymap2", - "itertools 0.10.5", + "itertools 0.12.1", "kstring", "liquid-derive", "num-traits", @@ -3140,9 +3238,9 @@ dependencies = [ [[package]] name = "liquid-derive" -version = "0.26.4" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" +checksum = "915f6d0a2963a27cd5205c1902f32ddfe3bc035816afd268cf88c0fc0f8d287e" dependencies = [ "proc-macro2", "quote", @@ -3151,11 +3249,11 @@ dependencies = [ [[package]] name = "liquid-lib" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a17e273a6fb1fb6268f7a5867ddfd0bd4683c7e19b51084f3d567fad4348c0" +checksum = "73f48fc446873f74d869582f5c4b8cbf3248c93395e410a67af5809b3731e44a" dependencies = [ - "itertools 0.10.5", + "itertools 0.12.1", "liquid-core", "once_cell", "percent-encoding", @@ -3164,17 +3262,11 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "litemap" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" - [[package]] name = "lmdb-master-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5142795c220effa4c8f4813537bd4c88113a07e45e93100ccb2adc5cec6c7f3" +checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24" dependencies = [ "cc", "doxygen-rs", @@ -3209,12 +3301,28 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "macro_rules_attribute" version = "0.2.0" @@ -3257,7 +3365,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.9.0" +version = "1.10.2" dependencies = [ "insta", "md5", @@ -3266,17 +3374,14 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.9.0" +version = "1.10.2" dependencies = [ "actix-cors", "actix-http", "actix-rt", "actix-utils", "actix-web", - "actix-web-static-files", "anyhow", - "assert-json-diff", - "async-stream", "async-trait", "brotli", "bstr", @@ -3295,12 +3400,11 @@ dependencies = [ "futures", "futures-util", "hex", - "http 0.2.11", "index-scheduler", "indexmap", "insta", "is-terminal", - "itertools 0.11.0", + "itertools 0.13.0", "jsonwebtoken", "lazy_static", "manifest-dir-macros", @@ -3323,15 +3427,17 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.21.12", + "roaring", + "rustls", "rustls-pemfile", + "rustls-pki-types", "segment", "serde", "serde_json", "serde_urlencoded", "sha-1", "sha2", - "siphasher 1.0.0", + "siphasher 1.0.1", "slice-group-by", "static-files", "sysinfo", @@ -3342,7 +3448,6 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-stream", "toml", "tracing", "tracing-actix-web", @@ -3351,16 +3456,16 @@ dependencies = [ "url", "urlencoding", "uuid", - "walkdir", + "wiremock", "yaup", - "zip", + "zip 2.1.3", ] [[package]] name = "meilisearch-auth" -version = "1.9.0" +version = "1.10.2" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "enum-iterator", "hmac", "maplit", @@ -3377,7 +3482,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.9.0" +version = "1.10.2" dependencies = [ "actix-web", "anyhow", @@ -3391,7 +3496,7 @@ dependencies = [ "fst", "insta", "meili-snap", - "memmap2 0.7.1", + "memmap2", "milli", "roaring", "serde", @@ -3407,7 +3512,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "clap", @@ -3421,18 +3526,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3446,7 +3542,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.9.0" +version = "1.10.2" dependencies = [ "arroy", "big_s", @@ -3474,21 +3570,23 @@ dependencies = [ "hf-hub", "indexmap", "insta", - "itertools 0.11.0", + "itertools 0.13.0", "json-depth-checker", "levenshtein_automata", "liquid", "maplit", "md5", "meili-snap", - "memmap2 0.7.1", + "memchr", + "memmap2", "mimalloc", "obkv", "once_cell", "ordered-float", "rand", - "rand_pcg", "rayon", + "rayon-par-bridge", + "rhai", "roaring", "rstar", "serde", @@ -3510,9 +3608,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -3684,6 +3782,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "num_threads" version = "0.1.7" @@ -3710,9 +3829,9 @@ dependencies = [ [[package]] name = "obkv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c459142426056c639ff88d053ebaaaeca0ee1411c94362892398ef4ccd81080" +checksum = "a2e27bcfe835a379d32352112f6b8dbae2d99d16a5fff42abe6e5ba5386c1e5a" [[package]] name = "once_cell" @@ -3756,9 +3875,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" dependencies = [ "num-traits", ] @@ -3775,16 +3894,6 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -[[package]] -name = "page_size" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "page_size" version = "0.6.0" @@ -3797,9 +3906,9 @@ dependencies = [ [[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", @@ -3818,17 +3927,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" @@ -3852,22 +3950,14 @@ checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.3" @@ -3886,7 +3976,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.9.0" +version = "1.10.2" dependencies = [ "big_s", "serde_json", @@ -4010,9 +4100,9 @@ dependencies = [ [[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" @@ -4087,6 +4177,15 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[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.0", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4122,22 +4221,32 @@ dependencies = [ [[package]] name = "procfs" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.6.0", "hex", "lazy_static", - "rustix 0.36.16", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.6.0", + "hex", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -4156,6 +4265,26 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "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]] name = "pulp" version = "0.18.9" @@ -4168,6 +4297,53 @@ dependencies = [ "reborrow", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.5", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -4177,6 +4353,12 @@ 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.8.5" @@ -4217,16 +4399,6 @@ dependencies = [ "rand", ] -[[package]] -name = "rand_pcg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -dependencies = [ - "rand_core", - "serde", -] - [[package]] name = "raw-cpuid" version = "10.7.0" @@ -4267,6 +4439,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rayon-par-bridge" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6a14d8f65834aca6b0fe4cbbd7a27e639cd3efb1f2a32de9942368f1991de8" +dependencies = [ + "rayon", +] + [[package]] name = "reborrow" version = "0.5.5" @@ -4304,9 +4485,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -4327,9 +4508,9 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" @@ -4338,21 +4519,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "reqwest" -version = "0.11.23" +name = "rend" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ - "base64 0.21.7", + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", - "http 0.2.11", + "http 1.1.0", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4360,12 +4551,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", + "quinn", + "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", "tokio-rustls", "tokio-util", @@ -4375,10 +4568,39 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots", "winreg", ] +[[package]] +name = "rhai" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "instant", + "num-traits", + "once_cell", + "rhai_codegen", + "serde", + "smallvec", + "smartstring", + "thin-vec", +] + +[[package]] +name = "rhai_codegen" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "ring" version = "0.17.8" @@ -4395,10 +4617,39 @@ dependencies = [ ] [[package]] -name = "roaring" -version = "0.10.5" +name = "rkyv" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8" +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 = "roaring" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" dependencies = [ "bytemuck", "byteorder", @@ -4407,9 +4658,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" dependencies = [ "heapless", "num-traits", @@ -4417,6 +4668,22 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -4438,89 +4705,55 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.36.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - [[package]] name = "rustix" version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki", "subtle", "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -4529,9 +4762,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" @@ -4565,20 +4798,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.1" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "segment" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" +checksum = "5bdca318192c89bb31bffa2ef8e9e9898bc80f15a78db2fdd41cd051f1b41d01" dependencies = [ "async-trait", "reqwest", @@ -4605,9 +4834,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -4623,9 +4852,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4634,9 +4863,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap", "itoa", @@ -4655,9 +4884,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4731,6 +4960,18 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +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 = "similar" version = "2.2.1" @@ -4757,9 +4998,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -4788,9 +5029,12 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smartstring" @@ -4799,6 +5043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ "autocfg", + "serde", "static_assertions", "version_check", ] @@ -4839,9 +5084,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spm_precompiled" @@ -4863,9 +5105,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "static-files" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b" +checksum = "4e8590e848e1c53be9258210bcd4a8f4118e08988f03a4e2d63b62e4ad9f7ced" dependencies = [ "change-detection", "mime_guess", @@ -4905,7 +5147,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4940,6 +5182,24 @@ dependencies = [ "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.60", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synchronoise" version = "1.0.1" @@ -4966,7 +5226,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -4976,9 +5236,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.5" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4990,31 +5250,16 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -5038,7 +5283,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.31", + "rustix", "windows-sys 0.52.0", ] @@ -5051,6 +5296,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" +dependencies = [ + "serde", +] + [[package]] name = "thiserror" version = "1.0.61" @@ -5083,14 +5337,14 @@ dependencies = [ [[package]] name = "tiktoken-rs" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40894b788eb28bbb7e36bdc8b7b1b1488b9c93fa3730f315ab965330c94c0842" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" dependencies = [ "anyhow", "base64 0.21.7", "bstr", - "fancy-regex", + "fancy-regex 0.12.0", "lazy_static", "parking_lot", "rustc-hash", @@ -5129,6 +5383,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -5186,9 +5449,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -5205,9 +5468,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -5216,56 +5479,45 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", + "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.15", ] [[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", ] @@ -5275,14 +5527,46 @@ name = "toml_edit" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.13", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5419,9 +5703,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unescaper" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" +checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" dependencies = [ "thiserror", ] @@ -5497,29 +5781,28 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.22.4", + "rustls", "rustls-pki-types", - "rustls-webpki 0.102.2", "serde", "serde_json", "socks", "url", - "webpki-roots 0.26.1", + "webpki-roots", ] [[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", @@ -5547,11 +5830,10 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "atomic", "getrandom", "serde", ] @@ -5570,25 +5852,24 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "9.0.0-beta.2" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107dc53b443fe8cc380798abb75ad6b7038281165109afea1f1b28bb47047ed5" +checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f" dependencies = [ "anyhow", - "derive_builder 0.13.1", - "getset", + "derive_builder 0.20.0", "rustversion", "vergen-lib", ] [[package]] name = "vergen-git2" -version = "1.0.0-beta.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8875c5d71074bb67118774e3d795ab6fe77c3ae3161cb54e19104cabc49487f1" +checksum = "a62c52cd2b2b8b7ec75fc20111b3022ac3ff83e4fc14b9497cfcfd39c54f9c67" dependencies = [ "anyhow", - "derive_builder 0.13.1", + "derive_builder 0.20.0", "git2", "rustversion", "time", @@ -5598,12 +5879,12 @@ dependencies = [ [[package]] name = "vergen-lib" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ebfba72ba904559f25f41ea1512335b5a46459084258cea0857549d9645187" +checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720" dependencies = [ "anyhow", - "derive_builder 0.13.1", + "derive_builder 0.20.0", "getset", "rustversion", ] @@ -5718,9 +5999,9 @@ 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", @@ -5739,12 +6020,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - [[package]] name = "webpki-roots" version = "0.26.1" @@ -5760,7 +6035,7 @@ version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" dependencies = [ - "hashbrown", + "hashbrown 0.14.3", "once_cell", ] @@ -6022,27 +6297,71 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "xattr" -version = "1.0.1" +name = "wiremock" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http 1.1.0", + "http-body-util", + "hyper", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[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 = "xtask" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "build-info", @@ -6069,23 +6388,15 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed111bd9e48a802518765906cbdadf0b45afb72b9c81ab049a3b86252adffdd" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yaup" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a59e7d27bed43f7c37c25df5192ea9d435a8092a902e02203359ac9ce3e429d9" +checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6" dependencies = [ + "form_urlencoded", "serde", - "url", + "thiserror", ] [[package]] @@ -6155,55 +6466,97 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] [[package]] -name = "zerovec" -version = "0.10.1" +name = "zeroize_derive" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "zerofrom", + "proc-macro2", + "quote", + "syn 2.0.60", ] [[package]] name = "zip" -version = "0.6.6" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "indexmap", + "num_enum", + "thiserror", +] + +[[package]] +name = "zip" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ - "libc", "zstd-sys", ] diff --git a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix index a58af212b2..a7e8c7f8cb 100644 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.9.0"; + version = "1.10.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -20,14 +20,9 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-fPXhayS8OKiiiDvVvBry3njZ74/W6oVL0p85Z5qf3KA=="; + hash = "sha256-gI0Azbb4gYFf4E/oIoJbln/mkbJIenSPzGUVliGzOzE="; }; - cargoPatches = [ - # fix build with Rust 1.80 - ./time-crate.patch - ]; - cargoBuildFlags = [ "--package=meilisearch" ]; cargoLock = { @@ -64,7 +59,10 @@ rustPlatform.buildRustPackage { homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ happysalada ]; + maintainers = with lib.maintainers; [ + happysalada + bbenno + ]; platforms = [ "aarch64-linux" "aarch64-darwin" diff --git a/third_party/nixpkgs/pkgs/servers/search/meilisearch/time-crate.patch b/third_party/nixpkgs/pkgs/servers/search/meilisearch/time-crate.patch deleted file mode 100644 index b0b81f6502..0000000000 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/time-crate.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3c728f348..51df0ea7b 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -5098,9 +5098,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -5121,9 +5121,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", diff --git a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix index 4177c8a2e5..7a9cf1ce2e 100644 --- a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-I5CI9t5jsayE58O3lGRLQ2zj5lClWldKNsPBS4tNtfs="; + hash = "sha256-9m7Vt+x4SPOBAqVL88gufSmqhvAiCcnOi7bL43XzCiU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 9e9b2b7f95..deb1f13f48 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.49.11"; + version = "11.51.3"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-tnGRNTx/SH7Yj8xvaFUxKr8af+7b8ZouU4PdmKEMkKk="; + hash = "sha256-ql6J4e62sL/g6s6cr2xMoxmlsLyovapaGtpcQIZ9tOU="; }; nativeBuildInputs = [ bison cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix index 1d1a64e316..e48afe07af 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_lts; + tests.percona-server = nixosTests.mysql.percona-server_8_0; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix index 0b68f84d4b..01bac0fdef 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_innovation; + tests.percona-server = nixosTests.mysql.percona-server_8_4; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 86fab4f8db..d67a21755a 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.6.2"; + version = "3.6.3"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = "pgrouting"; rev = "v${version}"; - hash = "sha256-r+OkhieKTiOfYSnDbiy3p8V8cgb8I1+bneFwItDfDYo="; + hash = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index c71f91e353..c0759da351 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.14.5"; + version = "2.14.6"; format = "other"; pythonPath = [ setuptools ]; @@ -11,8 +11,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "Tautulli"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-Xb8sby56U6Tc+OlxN7yKdhGGxrkmn6VfSPBhc1/YH24="; + rev = "v${version}"; + sha256 = "sha256-sZHrEDb3uuogSjG2qKSm6V+nHZq/FdMq9xQgTIerjuE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock b/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock deleted file mode 100644 index 7148f803bb..0000000000 --- a/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock +++ /dev/null @@ -1,2014 +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 = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "asn1-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[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 = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64ct" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" - -[[package]] -name = "bindgen" -version = "0.68.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -dependencies = [ - "bitflags 2.4.0", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.23", -] - -[[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.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "boring" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92667e5967bf826198f88dd3e43616973f8902769a6151616a65be1289a3c531" -dependencies = [ - "bitflags 2.4.0", - "boring-sys", - "foreign-types", - "libc", - "once_cell", -] - -[[package]] -name = "boring-sys" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04f5e0e2dc8315f68251391a4ac6da54793525c01d0206b10732b71139768cd" -dependencies = [ - "bindgen", - "cmake", - "fs_extra", - "fslock", -] - -[[package]] -name = "bufstream" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cbindgen" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faeaa693e5a727975a79211b8f35c0cb09b031fdb6eaa4a788bc6713d01488ca" -dependencies = [ - "clap", - "heck", - "indexmap", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.107", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const-oid" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] -name = "crypto-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" -dependencies = [ - "generic-array 0.14.6", - "subtle 2.4.1", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array 0.14.6", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - -[[package]] -name = "data-encoding" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" - -[[package]] -name = "delog" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd67f90cc14e0a91cf693141453cccf2b74db9d59c40f6be18b79169fe77dfd" -dependencies = [ - "log", -] - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid 0.7.1", - "crypto-bigint", - "pem-rfc7468 0.3.1", -] - -[[package]] -name = "der" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219" -dependencies = [ - "const-oid 0.9.2", - "pem-rfc7468 0.7.0", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.3", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "const-oid 0.9.2", - "crypto-common", -] - -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide 0.6.2", -] - -[[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", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heapless" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin 0.9.4", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[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.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac", - "digest 0.8.1", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.6", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" -dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix 0.36.16", - "windows-sys 0.42.0", -] - -[[package]] -name = "iso7816" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e6ac743d509349b7865595ce90bbfcfbe59f42b8ec0db9e76ec361ace3f652" -dependencies = [ - "delog", - "heapless", -] - -[[package]] -name = "iso7816-tlv" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47365efc3b4c252f8a3384445c0f7e8a4e0ae5c22bf3bedd2dd16f9bb45016a" -dependencies = [ - "untrusted 0.9.0", -] - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "md-5" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "opaque-debug", -] - -[[package]] -name = "md4" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4030c65cf2aab7ada769cae7d1e7159f8d034d6ded4f39afba037f094bfd9a1" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_enum" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem-rfc7468" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pkcs1" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" -dependencies = [ - "der 0.5.1", - "pkcs8 0.8.0", - "zeroize", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der 0.7.5", - "pkcs8 0.10.2", - "spki 0.7.2", -] - -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der 0.5.1", - "spki 0.5.4", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.5", - "spki 0.7.2", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro2" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rc4" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1256e23efe6097f27aa82d6ca6889361c001586ae0f6917cbad072f05eb275" -dependencies = [ - "cipher", -] - -[[package]] -name = "rdp-client" -version = "0.1.0" -dependencies = [ - "bitflags 2.4.0", - "byteorder", - "cbindgen", - "env_logger", - "iso7816", - "iso7816-tlv", - "libc", - "log", - "num-derive", - "num-traits", - "png", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rdp-rs", - "rsa 0.9.2", - "tempfile", - "utf16string", - "uuid", -] - -[[package]] -name = "rdp-rs" -version = "0.1.0" -source = "git+https://github.com/gravitational/rdp-rs?rev=edfb5330a11d11eaf36d65e4300555368b4c6b02#edfb5330a11d11eaf36d65e4300555368b4c6b02" -dependencies = [ - "boring", - "bufstream", - "byteorder", - "gethostname", - "hmac", - "indexmap", - "md-5", - "md4", - "num-bigint 0.2.6", - "num_enum", - "oid-registry", - "rand 0.7.3", - "rc4", - "ring", - "rsa 0.6.1", - "rustls", - "x509-parser", - "yasna", -] - -[[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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "rsa" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.3.3", - "pkcs8 0.8.0", - "rand_core 0.6.4", - "smallvec", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "rsa" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" -dependencies = [ - "byteorder", - "const-oid 0.9.2", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.7.5", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "signature", - "spki 0.7.2", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.36.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[package]] -name = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" - -[[package]] -name = "serde" -version = "1.0.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signature" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" -dependencies = [ - "digest 0.10.6", - "rand_core 0.6.4", -] - -[[package]] -name = "simd-adler32" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der 0.5.1", -] - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der 0.7.5", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "unicode-xid", -] - -[[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.4", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "toml" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" -dependencies = [ - "serde", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "utf16string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" -dependencies = [ - "byteorder", -] - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.107", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[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.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "yasna" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb" - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" diff --git a/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix deleted file mode 100644 index eda21fd7cb..0000000000 --- a/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -args: -import ../generic.nix (args // { - version = "14.3.20"; - hash = "sha256-oGN3t0xt7z3+U7wlhnJu4B8cSSMwONdiHZkv8UY7lkA="; - vendorHash = "sha256-RMTHWrbwKCGlxi9SP+8ccGk8YYqwhC8yWLPDf2Ha5bE="; - yarnHash = "sha256-c5ItZpq9Wp+kE9gw2WQdm5gTvBKA9I+nHAX/pT4Hqhs="; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4="; - }; - }; -}) diff --git a/third_party/nixpkgs/pkgs/servers/teleport/16/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/16/default.nix index 1b8d89fb0f..75104b03d1 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/16/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/16/default.nix @@ -3,7 +3,7 @@ import ../generic.nix (args // { version = "16.2.0"; hash = "sha256-3LLoO7SNJfEfDEU7JnAhmAOIdRO+TkgiJKjT8sqzelo="; vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8="; - pnpmHash = "sha256-phDrOSFQsgA+I4PDK9LJasUBXBO8EkVtQIMx9M4v8u0="; + pnpmHash = "sha256-lcev7VwTcuCuced8uZzLoobREWtNRDFRFdfmabJPLtc="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index 10b4eb98ef..eb8f6fb449 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -1,7 +1,6 @@ { callPackages, lib, ... }@args: let f = args: rec { - teleport_14 = import ./14 args; teleport_15 = import ./15 args; teleport_16 = import ./16 args; teleport = teleport_16; diff --git a/third_party/nixpkgs/pkgs/servers/teleport/generic.nix b/third_party/nixpkgs/pkgs/servers/teleport/generic.nix index 2fcdc7f4a6..abeed3b244 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/generic.nix @@ -156,11 +156,6 @@ buildGoModule rec { # Reduce closure size for client machines outputs = [ "out" "client" ]; - prePatch = '' - # TODO: remove after https://github.com/NixOS/nixpkgs/pull/332852 merges - sed -i 's/go 1.22.6/go 1.22.5/' go.mod - ''; - preBuild = '' cp -r ${webassets} webassets '' + lib.optionalString withRdpClient '' diff --git a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix b/third_party/nixpkgs/pkgs/servers/ursadb/default.nix index c8111fc648..e9bb814981 100644 --- a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ursadb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ursadb"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "ursadb"; rev = "v${finalAttrs.version}"; - hash = "sha256-5kVci9o1jUDpbTgMuach8AjXCKhTglcgsywHt3yoo2Y="; + hash = "sha256-UVfOImngYPB8UBQHzxwJM+dT3DWiT+7V+QGfUggjazI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix index 28a06b0e02..bae680cf78 100644 --- a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-/B7MMRkI5DhDBWa53mgFUME1CR3FSxxQ8UWjlN19EmQ="; + hash = "sha256-HQ1NaAHY1YRbNUThW983V8x3ptzTc/zNP6yIMyDiq1s="; }; vendorHash = "sha256-1k9YFdackF10iJWJ22XlaENlOfRkZMs+IedDWnd/h8E="; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json index 36c61ba3d9..d5cb6756cc 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json @@ -4,5 +4,5 @@ "serverHash": "sha256-ellHimZdbB5EQSHVsppBNYyZOODpUADvUn7u6JOu1ns=", "serverCargoHash": "sha256-UdFw8RPKYLqY98So8z9kiaVCl3b8KaqIoUMK/EV2uNM=", "uiHash": "sha256-bhbZQ8tDnJ6TWYj+ki/JQW8cbVjRfLzxaXRDX9JAIm4=", - "uiPNPMDepsHash": "sha256-aJPa46a2W8xHlDzFt0QMFQtEoUSkFQtN9VhaQOvoVio=" + "uiPNPMDepsHash": "sha256-+L6evDPMlEwWk/5qedvITHYRzu1jzB1cLiCTsauPbUI=" } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix index 5816e1dd91..362230da8d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,13 +2,22 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.304"; + version = "2.5.305"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-w89+X3sqZPlX7EuK/g2oATHqlpx1br/Njh81vZt8zYM="; + sha256 = "sha256-beP9k1msJjg9IQbU/CmzTodjMvUnWrLYcw0EleR1OJk="; }; + # Unpack the tarball into a subdir. All the contents are copied into `$out`. + # Unpacking into the parent directory would also copy `env-vars` into `$out` + # in the `installPhase` which ultimately means that the package retains + # references to build tools and the tarball. + preUnpack = '' + mkdir source + cd source + ''; + sourceRoot = "."; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix index 37830973fb..d6dab1fef4 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,13 +1,20 @@ -{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp +{ stdenv, makeWrapper, lib, fetchurl, libpng, libjpeg, libwebp , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd -, flock, autoreconfHook +, autoreconfHook , gawk +, rebar3WithPlugins +, fetchFromGitHub +, fetchgit +, fetchHex +, beamPackages , nixosTests , withMysql ? false , withPgsql ? false , withSqlite ? false, sqlite , withPam ? false, pam , withZlib ? true, zlib +, withSip ? false +, withLua ? false , withTools ? false , withRedis ? false , withImagemagick ? false, imagemagick @@ -15,83 +22,117 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ]; + + provider_asn1 = beamPackages.buildRebar3 { + name = "provider_asn1"; + version = "0.3.0"; + src = fetchHex { + pkg = "provider_asn1"; + version = "0.3.0"; + sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU="; + }; + beamDeps = [ ]; + }; + rebar3_hex = beamPackages.buildRebar3 { + name = "rebar3_hex"; + version = "7.0.7"; + src = fetchHex { + pkg = "rebar3_hex"; + version = "7.0.7"; + sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok="; + }; + beamDeps = [ ]; + }; + + allBeamDeps = import ./rebar-deps.nix { # TODO(@chuangzhu) add updateScript + inherit fetchHex fetchgit fetchFromGitHub; + builder = lib.makeOverridable beamPackages.buildRebar3; + + overrides = final: prev: { + jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; }; + cache_tab = prev.cache_tab.override { buildPlugins = [ beamPackages.pc ]; }; + mqtree = prev.mqtree.override { buildPlugins = [ beamPackages.pc ]; }; + stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; }; + p1_acme = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + eimp = prev.eimp.override { + buildInputs = [ gd libwebp libpng libjpeg ]; + buildPlugins = [ beamPackages.pc ]; + }; + fast_tls = prev.fast_tls.override { + buildInputs = [ openssl ]; + buildPlugins = [ beamPackages.pc ]; + }; + fast_xml = prev.fast_xml.override { + buildInputs = [ expat ]; + buildPlugins = [ beamPackages.pc ]; + }; + fast_yaml = prev.fast_yaml.override { + buildInputs = [ libyaml ]; + buildPlugins = [ beamPackages.pc ]; + }; + xmpp = prev.xmpp.override { + buildPlugins = [ beamPackages.pc provider_asn1 ]; + }; + # Optional deps + sqlite3 = prev.sqlite3.override { + buildInputs = [ sqlite ]; + buildPlugins = [ beamPackages.pc ]; + }; + p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + epam = prev.epam.override { + buildInputs = [ pam ]; + buildPlugins = [ beamPackages.pc ]; + }; + esip = prev.esip.override { buildPlugins = [ beamPackages.pc ]; }; + ezlib = prev.ezlib.override { + buildInputs = [ zlib ]; + buildPlugins = [ beamPackages.pc ]; + }; + }; + }; + + beamDeps = builtins.removeAttrs allBeamDeps [ "sqlite3" "p1_pgsql" "p1_mysql" "luerl" "esip" "eredis" "epam" "ezlib" ]; + in stdenv.mkDerivation rec { pname = "ejabberd"; - version = "23.10"; + version = "24.07"; - nativeBuildInputs = [ makeWrapper autoreconfHook ]; + nativeBuildInputs = [ + makeWrapper + autoreconfHook + (rebar3WithPlugins { plugins = [ provider_asn1 rebar3_hex ]; }) + ]; - buildInputs = [ erlang openssl expat libyaml gd ] - ++ lib.optional withSqlite sqlite - ++ lib.optional withPam pam - ++ lib.optional withZlib zlib + buildInputs = [ erlang ] + ++ builtins.attrValues beamDeps + ++ lib.optional withMysql allBeamDeps.p1_mysql + ++ lib.optional withPgsql allBeamDeps.p1_pgsql + ++ lib.optional withSqlite allBeamDeps.sqlite3 + ++ lib.optional withPam allBeamDeps.epam + ++ lib.optional withZlib allBeamDeps.ezlib + ++ lib.optional withSip allBeamDeps.esip + ++ lib.optional withLua allBeamDeps.luerl + ++ lib.optional withRedis allBeamDeps.eredis ; src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz"; - hash = "sha256-DW5/DYLZHNqJ4lddmag1B0E9ov/eObIVGASUeioPolg="; - # remember to update the deps FOD hash & its pinned ejabberd-po commit + hash = "sha256-wPt0asuoGl20Hel8A5aMH2gaE7G2waiVtxguM4IMGNk="; + # remember to update rebar-deps.nix }; passthru.tests = { inherit (nixosTests) ejabberd; }; - deps = stdenv.mkDerivation { - pname = "ejabberd-deps"; - - inherit src version; - - # pin ejabberd-po dep - # update: curl -L api.github.com/repos/processone/ejabberd-po/branches/main | jq .commit.sha -r - postPatch = '' - substituteInPlace rebar.config \ - --replace \ - '{git, "https://github.com/processone/ejabberd-po", {branch, "main"}}' \ - '{git, "https://github.com/processone/ejabberd-po", {tag, "26d6463386588d39f07027dabff3cb8dd938bf6b"}}' - ''; - - configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; - - nativeBuildInputs = [ - git erlang openssl expat libyaml sqlite pam zlib autoreconfHook - ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - makeFlags = [ "deps" ]; - - installPhase = '' - for i in deps/*; do - ( cd $i - git reset --hard - git clean -ffdx - git describe --always --tags > .rev - rm -rf .git .github - ) - done - # not a typo; comes from `make deps` - rm deps/.got - - cp -r deps $out - ''; - - dontPatchELF = true; - dontStrip = true; - # avoid /nix/store references in the source - dontPatchShebangs = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-HrLu3wTF+cUxpGX0yK3nbB57SRM2ND3Crlxs5/8FIwI="; - }; - configureFlags = [ (lib.enableFeature withMysql "mysql") (lib.enableFeature withPgsql "pgsql") (lib.enableFeature withSqlite "sqlite") (lib.enableFeature withPam "pam") (lib.enableFeature withZlib "zlib") + (lib.enableFeature withSip "sip") + (lib.enableFeature withLua "lua") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; @@ -99,21 +140,20 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' - cp -r $deps deps - chmod -R +w deps patchShebangs . + mkdir -p _build/default/lib + touch _build/default/lib/.got + touch _build/default/lib/.built ''; + REBAR_IGNORE_DEPS = 1; + postInstall = '' sed -i \ -e '2iexport PATH=${ctlpath}:$PATH' \ - -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \ - -e 's,\(^ *JOT=\).*,\1,' \ - -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ + -e "s,\(^ *ERL_LIBS=.*\),\1:$ERL_LIBS," \ $out/sbin/ejabberdctl - wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''} - rm $out/bin/{mix,iex,elixir} ''; meta = with lib; { @@ -122,6 +162,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://www.ejabberd.im"; platforms = platforms.linux; - maintainers = with maintainers; [ sander abbradar ]; + maintainers = with maintainers; [ sander abbradar chuangzhu ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix new file mode 100644 index 0000000000..db5899e271 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix @@ -0,0 +1,278 @@ +# Generated by rebar3_nix +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + unicode_util_compat = builder { + name = "unicode_util_compat"; + version = "0.7.0"; + src = fetchHex { + pkg = "unicode_util_compat"; + version = "0.7.0"; + sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE="; + }; + beamDeps = [ ]; + }; + jiffy = builder { + name = "jiffy"; + version = "1.1.2"; + src = fetchHex { + pkg = "jiffy"; + version = "1.1.2"; + sha256 = "sha256-u2G8Qqcgu9M8sJpBDki7eaYQEsdMuLPnXybZiEhc84E="; + }; + beamDeps = [ ]; + }; + base64url = builder { + name = "base64url"; + version = "1.0.1"; + src = fetchHex { + pkg = "base64url"; + version = "1.0.1"; + sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w="; + }; + beamDeps = [ ]; + }; + yconf = builder { + name = "yconf"; + version = "1.0.16"; + src = fetchHex { + pkg = "yconf"; + version = "1.0.16"; + sha256 = "sha256-6UeBMnPzhxHHsuWo5KzJpRx7voVPdEo0X2AwCzhYbIk="; + }; + beamDeps = [ fast_yaml ]; + }; + xmpp = builder { + name = "xmpp"; + version = "1.8.3"; + src = fetchHex { + pkg = "xmpp"; + version = "1.8.3"; + sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE="; + }; + beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ]; + }; + stun = builder { + name = "stun"; + version = "1.2.14"; + src = fetchHex { + pkg = "stun"; + version = "1.2.14"; + sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM="; + }; + beamDeps = [ fast_tls p1_utils ]; + }; + stringprep = builder { + name = "stringprep"; + version = "1.0.30"; + src = fetchHex { + pkg = "stringprep"; + version = "1.0.30"; + sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o="; + }; + beamDeps = [ p1_utils ]; + }; + sqlite3 = builder { + name = "sqlite3"; + version = "1.1.15"; + src = fetchHex { + pkg = "sqlite3"; + version = "1.1.15"; + sha256 = "sha256-PAuk4TMiwq1J3k4t3SgxE2at3lS+ro26nZ44iPadKFc="; + }; + beamDeps = [ ]; + }; + pkix = builder { + name = "pkix"; + version = "1.0.10"; + src = fetchHex { + pkg = "pkix"; + version = "1.0.10"; + sha256 = "sha256-4CFk+DCUyxJMQbGrKJiKYV1Uua3DhXXwDxmll6OsXQ4="; + }; + beamDeps = [ ]; + }; + p1_utils = builder { + name = "p1_utils"; + version = "1.0.26"; + src = fetchHex { + pkg = "p1_utils"; + version = "1.0.26"; + sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw="; + }; + beamDeps = [ ]; + }; + p1_pgsql = builder { + name = "p1_pgsql"; + version = "1.1.27"; + src = fetchHex { + pkg = "p1_pgsql"; + version = "1.1.27"; + sha256 = "sha256-jk0adgLLaHgOVdidxamy4arKP08e49GiXy+MPSNk/7k="; + }; + beamDeps = [ xmpp ]; + }; + p1_oauth2 = builder { + name = "p1_oauth2"; + version = "0.6.14"; + src = fetchHex { + pkg = "p1_oauth2"; + version = "0.6.14"; + sha256 = "sha256-H9OsR05Dci2dWofG34029pjth697uBy7tmNhRR2Zro8="; + }; + beamDeps = [ ]; + }; + p1_mysql = builder { + name = "p1_mysql"; + version = "1.0.24"; + src = fetchHex { + pkg = "p1_mysql"; + version = "1.0.24"; + sha256 = "sha256-8FiGX2Qlf1B6LGpa/zabE3XbyzCz1CWNrU8bPq/7ZV8="; + }; + beamDeps = [ ]; + }; + p1_acme = builder { + name = "p1_acme"; + version = "1.0.23"; + src = fetchHex { + pkg = "p1_acme"; + version = "1.0.23"; + sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk="; + }; + beamDeps = [ base64url idna jiffy jose yconf ]; + }; + mqtree = builder { + name = "mqtree"; + version = "1.0.17"; + src = fetchHex { + pkg = "mqtree"; + version = "1.0.17"; + sha256 = "sha256-X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM="; + }; + beamDeps = [ p1_utils ]; + }; + luerl = builder { + name = "luerl"; + version = "1.2.0"; + src = fetchHex { + pkg = "luerl"; + version = "1.2.0"; + sha256 = "sha256-nK/U9glP8PWp0nj9gdYNPgJsggvftsrNSxvZCfIbUl0="; + }; + beamDeps = [ ]; + }; + jose = builder { + name = "jose"; + version = "1.11.10"; + src = fetchHex { + pkg = "jose"; + version = "1.11.10"; + sha256 = "sha256-DWzTb/i6F02ykUj8EStYQhhraKkM6fwrPsOv52WT5hQ="; + }; + beamDeps = [ ]; + }; + idna = builder { + name = "idna"; + version = "6.1.1"; + src = fetchHex { + pkg = "idna"; + version = "6.1.1"; + sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo="; + }; + beamDeps = [ unicode_util_compat ]; + }; + fast_yaml = builder { + name = "fast_yaml"; + version = "1.0.37"; + src = fetchHex { + pkg = "fast_yaml"; + version = "1.0.37"; + sha256 = "sha256-jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k="; + }; + beamDeps = [ p1_utils ]; + }; + fast_xml = builder { + name = "fast_xml"; + version = "1.1.52"; + src = fetchHex { + pkg = "fast_xml"; + version = "1.1.52"; + sha256 = "sha256-eVGSOQ4G0rZQFqaZC7+lcn9KJtKRSAixw8mjLu3NG/0="; + }; + beamDeps = [ p1_utils ]; + }; + fast_tls = builder { + name = "fast_tls"; + version = "1.1.21"; + src = fetchHex { + pkg = "fast_tls"; + version = "1.1.21"; + sha256 = "sha256-ExVCkTk3Al5IzYCqgfADWWhtVQG3ViHnICaoe1IpUFs="; + }; + beamDeps = [ p1_utils ]; + }; + ezlib = builder { + name = "ezlib"; + version = "1.0.13"; + src = fetchHex { + pkg = "ezlib"; + version = "1.0.13"; + sha256 = "sha256-nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s="; + }; + beamDeps = [ p1_utils ]; + }; + esip = builder { + name = "esip"; + version = "1.0.54"; + src = fetchHex { + pkg = "esip"; + version = "1.0.54"; + sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4="; + }; + beamDeps = [ fast_tls p1_utils stun ]; + }; + eredis = builder { + name = "eredis"; + version = "1.2.0"; + src = fetchHex { + pkg = "eredis"; + version = "1.2.0"; + sha256 = "sha256-2bWr7ywsirqPMqoBggPgs9yLEVd3OyVKsdTCACMX8eE="; + }; + beamDeps = [ ]; + }; + epam = builder { + name = "epam"; + version = "1.0.14"; + src = fetchHex { + pkg = "epam"; + version = "1.0.14"; + sha256 = "sha256-LzRJ5yiFpypsKoQ/VhrdD8L3DXoh9hRWkwpUdHPU2Yk="; + }; + beamDeps = [ ]; + }; + eimp = builder { + name = "eimp"; + version = "1.0.23"; + src = fetchHex { + pkg = "eimp"; + version = "1.0.23"; + sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo="; + }; + beamDeps = [ p1_utils ]; + }; + cache_tab = builder { + name = "cache_tab"; + version = "1.0.31"; + src = fetchHex { + pkg = "cache_tab"; + version = "1.0.31"; + sha256 = "sha256-hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E="; + }; + beamDeps = [ p1_utils ]; + }; + }; +in self diff --git a/third_party/nixpkgs/pkgs/shells/ion/Cargo.lock b/third_party/nixpkgs/pkgs/shells/ion/Cargo.lock index e8355a3928..22b5515503 100644 --- a/third_party/nixpkgs/pkgs/shells/ion/Cargo.lock +++ b/third_party/nixpkgs/pkgs/shells/ion/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph_rasterizer" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "adler" @@ -22,9 +22,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -35,7 +35,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "rusttype", "walkdir", "xdg", @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -98,7 +98,7 @@ checksum = "da47c46001293a2c4b744d731958be22cff408a2ab76e2279328f9713b1267b4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -111,20 +111,20 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bitflags" @@ -132,6 +132,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "blake2b_simd" version = "0.5.11" @@ -149,18 +155,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "builtins-proc" version = "0.1.0" @@ -168,37 +162,37 @@ dependencies = [ "darling", "ion-shell", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.11.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "calculate" version = "0.7.0" -source = "git+https://gitlab.redox-os.org/redox-os/calc#9f975c504bf6d1a2bcf44992866233f49afaeb29" +source = "git+https://gitlab.redox-os.org/redox-os/calc?rev=d2719efb67ab38c4c33ab3590822114453960da5#d2719efb67ab38c4c33ab3590822114453960da5" dependencies = [ "atty", "clap", @@ -226,9 +220,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -259,7 +253,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -272,10 +266,10 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types", "libc", @@ -284,14 +278,14 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types", "libc", @@ -300,15 +294,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "core-graphics-types", - "foreign-types", "libc", "objc", ] @@ -337,11 +330,11 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys 0.8.6", "libc", ] @@ -353,9 +346,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -363,7 +356,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.7.0", "foreign-types", "libc", @@ -375,8 +368,8 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", - "core-foundation 0.9.3", + "bitflags 1.3.2", + "core-foundation 0.9.4", "core-graphics-types", "foreign-types", "libc", @@ -384,13 +377,12 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "foreign-types", + "bitflags 1.3.2", + "core-foundation 0.9.4", "libc", ] @@ -409,9 +401,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if 1.0.0", ] @@ -427,7 +419,7 @@ dependencies = [ "clap", "criterion-plot", "csv", - "itertools 0.10.3", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", @@ -449,72 +441,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", - "itertools 0.10.3", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", + "itertools 0.10.5", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", - "once_cell", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "csv" -version = "1.1.6" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -546,7 +517,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", - "syn", + "syn 1.0.109", ] [[package]] @@ -557,15 +528,29 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", ] [[package]] name = "decimal" version = "2.1.0" -source = "git+https://github.com/alkis/decimal.git#83cfb19d07188106e9399b36d2496a1a07ee619f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8ab77e91baeb15034c3be91e87bff4665c9036216148e4996d9a9f5792114d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "libc", ] @@ -588,7 +573,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -599,27 +584,7 @@ checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", + "syn 1.0.109", ] [[package]] @@ -639,11 +604,11 @@ dependencies = [ [[package]] name = "dlib" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.7.3", + "libloading 0.8.3", ] [[package]] @@ -658,14 +623,14 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "either" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "errno-dragonfly" @@ -710,7 +675,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -722,9 +687,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -737,9 +702,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -747,15 +712,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -764,27 +729,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -810,9 +775,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -821,9 +786,9 @@ dependencies = [ [[package]] name = "gfx" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b" +checksum = "eb754057e8bfb8fdb38a33b9caa213dbeb2cbbef2003fe6b2cb36dff96098e0a" dependencies = [ "draw_state", "gfx_core", @@ -836,7 +801,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441" dependencies = [ - "bitflags", + "bitflags 1.3.2", "draw_state", "log", ] @@ -904,9 +869,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glutin" @@ -917,7 +882,7 @@ dependencies = [ "android_glue", "cgl", "cocoa 0.23.0", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "glutin_egl_sys", "glutin_emscripten_sys", "glutin_gles2_sys", @@ -937,9 +902,9 @@ dependencies = [ [[package]] name = "glutin_egl_sys" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abb6aa55523480c4adc5a56bbaa249992e2dddb2fc63dc96e04a3355364c211" +checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" dependencies = [ "gl_generator 0.14.0", "winapi 0.3.9", @@ -963,9 +928,9 @@ dependencies = [ [[package]] name = "glutin_glx_sys" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e393c8fc02b807459410429150e9c4faffdb312d59b8c038566173c81991351" +checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468" dependencies = [ "gl_generator 0.14.0", "x11-dl", @@ -982,9 +947,15 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -1013,7 +984,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-iter", - "num-rational", + "num-rational 0.3.2", "num-traits", "png", "scoped_threadpool", @@ -1105,24 +1076,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni-sys" @@ -1141,9 +1106,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1193,7 +1158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -1201,9 +1166,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -1217,19 +1182,40 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.3" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "windows-targets 0.52.4", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.5.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", ] [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1237,12 +1223,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "malloc_buf" @@ -1255,9 +1238,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -1277,12 +1260,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -1390,7 +1367,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1401,9 +1378,9 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" [[package]] name = "net2" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -1416,7 +1393,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 0.1.10", "libc", @@ -1428,7 +1405,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", @@ -1439,41 +1416,31 @@ name = "nix" version = "0.23.1" source = "git+https://github.com/nix-rust/nix.git?rev=ff6f8b8a#ff6f8b8a26c8d61f4341e441acf405402b46a430" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset", ] -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "num" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.4.1", "num-traits", ] [[package]] name = "num-bigint" -version = "0.3.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1482,28 +1449,27 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -1515,6 +1481,17 @@ name = "num-rational" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-bigint", @@ -1524,23 +1501,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" version = "0.4.3" @@ -1560,7 +1527,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1588,9 +1555,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -1609,9 +1576,9 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.6.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" +checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" dependencies = [ "ttf-parser", ] @@ -1624,7 +1591,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -1634,41 +1601,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.9", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", - "windows-sys", + "windows-targets 0.48.5", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permutate" @@ -1678,9 +1645,9 @@ checksum = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1690,9 +1657,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piston" -version = "0.53.1" +version = "0.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f483bc0f9316e80f27c9f083fb20e8ae881a9799ad792cf683a059f3f58d6e6" +checksum = "6e465487e1063ebe4103bc0fb65bc3dd604b635b2012a41530d3a5f77106e526" dependencies = [ "pistoncore-event_loop", "pistoncore-input 1.0.1", @@ -1856,7 +1823,7 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd3f576d1a49fe2a86716b52ae72896319b05eb4d3abe41fb01abd3241cd5f7a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "piston-viewport", "serde", "serde_derive", @@ -1868,7 +1835,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2977fed6eb16c554fd445a09a50c8a0c250f4c50f752be46a7bd9dcc5ba471f0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "piston-viewport", "serde", "serde_derive", @@ -1886,15 +1853,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plotters" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -1905,15 +1872,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -1924,7 +1891,7 @@ version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "deflate", "miniz_oxide 0.3.7", @@ -1932,9 +1899,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" @@ -1945,44 +1912,20 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2077,26 +2020,22 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2116,8 +2055,8 @@ checksum = "9f4c8858baa4ad3c8bcc156ae91a0ffe22b76a3975c40c49b4f04c15c6bce0da" [[package]] name = "redox_liner" -version = "0.5.1" -source = "git+https://gitlab.redox-os.org/redox-os/liner#616e61657fd611c3fe5818e6151300cbcbdd5c06" +version = "0.5.2" +source = "git+https://gitlab.redox-os.org/redox-os/liner#acc38f5f2922c56b6c5a29af287c5ac8ceb066d9" dependencies = [ "bytecount", "itertools 0.8.2", @@ -2132,26 +2071,32 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "redox_termios" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" -dependencies = [ - "redox_syscall", -] +checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.7", - "redox_syscall", + "getrandom 0.2.12", + "libredox 0.1.3", "rust-argon2", "thiserror", "zeroize", @@ -2159,26 +2104,32 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rust-argon2" @@ -2194,25 +2145,19 @@ dependencies = [ [[package]] name = "rusttype" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" +checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", ] -[[package]] -name = "rustversion" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" - [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -2225,9 +2170,9 @@ dependencies = [ [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scoped_threadpool" @@ -2237,9 +2182,9 @@ checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scopes" @@ -2247,9 +2192,12 @@ version = "0.1.0" [[package]] name = "serde" -version = "1.0.140" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_cbor" @@ -2263,32 +2211,33 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.57", ] [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "itoa 1.0.2", + "itoa", "ryu", "serde", ] [[package]] name = "serial_test" -version = "0.8.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec42e7232e5ca56aa59d63af3c7f991fe71ee6a3ddd2d3480834cf3902b007" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" dependencies = [ + "dashmap", "futures", "lazy_static", "log", @@ -2298,15 +2247,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.8.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b95bb2f4f624565e8fe8140c789af7e2082c0e0561b5a82a1b678baa9703dc" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "rustversion", - "syn", + "syn 2.0.57", ] [[package]] @@ -2330,9 +2277,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2347,9 +2294,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" @@ -2358,7 +2305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" dependencies = [ "andrew", - "bitflags", + "bitflags 1.3.2", "calloop", "dlib 0.4.2", "lazy_static", @@ -2372,12 +2319,11 @@ dependencies = [ [[package]] name = "spin_sleep" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" +checksum = "368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f" dependencies = [ - "once_cell", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -2409,9 +2355,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2419,25 +2365,25 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] name = "termion" -version = "1.5.6" -source = "git+https://gitlab.redox-os.org/redox-os/termion#8054e082b01c3f45f89f0db96bc374f1e378deb1" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4648c7def6f2043b2568617b9f9b75eae88ca185dbc1f1fda30e95a85d49d7d" dependencies = [ "libc", + "libredox 0.0.2", "numtoa", - "redox_syscall", "redox_termios", ] @@ -2452,22 +2398,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.57", ] [[package]] @@ -2493,18 +2439,18 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "ttf-parser" -version = "0.6.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "types-rs" @@ -2517,27 +2463,21 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "users" @@ -2551,9 +2491,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" @@ -2571,7 +2511,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.12", ] [[package]] @@ -2589,12 +2529,6 @@ dependencies = [ "piston-float", ] -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "vte" version = "0.10.1" @@ -2618,12 +2552,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] @@ -2641,9 +2574,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2651,24 +2584,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2676,22 +2609,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-client" @@ -2699,7 +2632,7 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.20.0", @@ -2748,7 +2681,7 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -2771,16 +2704,16 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" dependencies = [ - "dlib 0.5.0", + "dlib 0.5.2", "lazy_static", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2788,9 +2721,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -2822,9 +2755,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi 0.3.9", ] @@ -2837,46 +2770,126 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows-targets 0.52.4", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" @@ -2884,9 +2897,9 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" dependencies = [ - "bitflags", - "cocoa 0.24.0", - "core-foundation 0.9.3", + "bitflags 1.3.2", + "cocoa 0.24.1", + "core-foundation 0.9.4", "core-graphics 0.22.3", "core-video-sys", "dispatch", @@ -2921,56 +2934,49 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.19.1" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs", -] +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "zeroize" -version = "1.5.7" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.57", ] diff --git a/third_party/nixpkgs/pkgs/shells/ion/build-script.patch b/third_party/nixpkgs/pkgs/shells/ion/build-script.patch index 8692892895..738a2178bf 100644 --- a/third_party/nixpkgs/pkgs/shells/ion/build-script.patch +++ b/third_party/nixpkgs/pkgs/shells/ion/build-script.patch @@ -1,17 +1,17 @@ +diff --git a/build.rs b/build.rs +index 9a32b7a2..77bc41bc 100644 --- a/build.rs +++ b/build.rs -@@ -23,13 +23,7 @@ fn write_version_file() -> io::Result<()> { - let target = env::var("TARGET").unwrap(); - let version_fname = Path::new(&env::var("OUT_DIR").unwrap()).join("version_string"); +@@ -25,10 +25,9 @@ fn write_version_file() -> io::Result<()> { let mut version_file = File::create(&version_fname)?; -- write!( -- &mut version_file, + write!( + &mut version_file, - "r#\"ion {} ({})\nrev {}\"#", -- version, ++ "r#\"ion {} ({})\nrev \"#", + version, - target, - get_git_rev()?.trim() -- )?; -+ write!(&mut version_file, "r#\"ion {version} ({target})\n\"#")?; ++ target + )?; Ok(()) - } - + } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/shells/ion/default.nix b/third_party/nixpkgs/pkgs/shells/ion/default.nix index a5e7f9edeb..22fef6ee4f 100644 --- a/third_party/nixpkgs/pkgs/shells/ion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/ion/default.nix @@ -1,31 +1,29 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitLab }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "ion"; - version = "unstable-2022-11-27"; + version = "unstable-2024-09-20"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.redox-os.org"; owner = "redox-os"; repo = "ion"; - rev = "3bb8966fc99ba223033e1e02b0a6d50fc25cbef4"; - sha256 = "sha256-6KW/YkMQFeGb1i+1YdADZRW89UruHsfPhMq9Cvxjl/4="; + rev = "8acd140eeec76cd5efbd36f9ea8425763200a76b"; + hash = "sha256-jiJ5XW7S6/pVEOPYJKurolLI3UrOyuaEP/cqm1a0rIU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "calculate-0.7.0" = "sha256-wUmi8XLgEMgECeaCM0r1KxJ+oTd47QozgFBANKSwt24="; - "decimal-2.1.0" = "sha256-s5mDRCkaDBUdaywYEJzTfe7qH25sG5UUo5iVmPE+zrw="; + "calculate-0.7.0" = "sha256-3CI+7TZeW1sk6pBigxESK/E7G+G1/MniVIn4sqfk7+w="; "nix-0.23.1" = "sha256-yWJYrQt9piJHhqBkH/hn9dsXR8oqzl0RKPrzx9fvqlw="; "object-pool-0.5.3" = "sha256-LWP0b62sk2dcqnQEEvLmZVvWSVLJ722yH/zIIPL93W4="; - "redox_liner-0.5.1" = "sha256-OT9E4AwQgm5NngcCtcno1VKhkS4d8Eq/l+8aYHvXtTY="; + "redox_liner-0.5.2" = "sha256-ZjVLACkyOT6jVRWyMj0ixJwCv6IjllCLHNTERlncIpk="; "small-0.1.0" = "sha256-QIzEfFc0EDEllf+YxVyV7j/PvC7nVWiK0YYBoZBQZ3Q="; - "termion-1.5.6" = "sha256-NTY/2SbqkSyslnN5Xg6lrQ0MTrOhTMHqN+XXqN6Nkr8="; }; }; @@ -34,24 +32,16 @@ rustPlatform.buildRustPackage rec { ./build-script.patch ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - # test assumes linux - "--skip=binary::completer::tests::filename_completion" - ]; - passthru = { shellPath = "/bin/ion"; }; meta = with lib; { description = "Modern system shell with simple (and powerful) syntax"; - mainProgram = "ion"; homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [dywedir arthsmn]; + mainProgram = "ion"; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 52c211b46b..0bb21e3cc8 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.99.0"; + version = "0.99.1"; in rustPlatform.buildRustPackage { @@ -31,11 +31,11 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "nushell"; repo = "nushell"; - rev = version; - hash = "sha256-X/+i4CSGAkNQ7oW1kbDUj/g6Hbrf17IXwpNPVmkE4tU="; + rev = "refs/tags/${version}"; + hash = "sha256-amPQJW8ofSMh2cQQrqPNOp/p33KwPNX7fpZ4SiJGQHU="; }; - cargoHash = "sha256-6cGzEZdk0zgrRRTHlnlEqZg8AcoUi2GR3wZ3iq4WGKA="; + cargoHash = "sha256-AblXOeSJGqrZY5aRzdst9F+ZB++/3Adu7Kri5lDsDH8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ] diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/dbus.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/dbus.nix new file mode 100644 index 0000000000..374f008548 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/dbus.nix @@ -0,0 +1,52 @@ +{ + stdenv, + runCommand, + lib, + rustPlatform, + pkg-config, + nix-update-script, + fetchFromGitHub, + dbus, + nushell, + nushell_plugin_dbus, +}: + +rustPlatform.buildRustPackage rec { + pname = "nu_plugin_dbus"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "devyn"; + repo = pname; + rev = version; + hash = "sha256-I6FB2Hu/uyA6lBGRlC6Vwxad7jrl2OtlngpmiyhblKs="; + }; + + cargoHash = "sha256-WwdeDiFVyk8ixxKS1v3P274E1wp+v70qCk+rNEpoce4="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; + buildInputs = [ dbus ]; + + passthru = { + updateScript = nix-update-script { }; + tests.check = + let + nu = lib.getExe nushell; + plugin = lib.getExe nushell_plugin_dbus; + in + runCommand "${pname}-test" { } '' + touch $out + ${nu} -n -c "plugin add --plugin-config $out ${plugin}" + ${nu} -n -c "plugin use --plugin-config $out dbus" + ''; + }; + + meta = with lib; { + description = "Nushell plugin for communicating with D-Bus"; + mainProgram = "nu_plugin_dbus"; + homepage = "https://github.com/devyn/nu_plugin_dbus"; + license = licenses.mit; + maintainers = with maintainers; [ aftix ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix index 5cfa7c3ed3..63a0413577 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, newScope, IOKit, CoreFoundation, Foundation, Security }: +{ lib, newScope, dbus, IOKit, CoreFoundation, Foundation, Security }: lib.makeScope newScope (self: with self; { gstat = callPackage ./gstat.nix { inherit Security; }; @@ -7,6 +7,8 @@ lib.makeScope newScope (self: with self; { query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; - units = callPackage ./units.nix { }; - highlight = callPackage ./highlight.nix { }; + units = callPackage ./units.nix { inherit IOKit Foundation; }; + highlight = callPackage ./highlight.nix { inherit IOKit Foundation; }; + dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; }; + skim = callPackage ./skim.nix { inherit IOKit CoreFoundation; }; }) diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix index 057bded72d..1dd473260c 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-dfJ1EgbTygLky2sE6nW5fYiZDAfsrTb4Qw18u1nFNYY="; + cargoHash = "sha256-9wKJkZnbM8Zt90LlSTd9hb40Xuy2cOBThwUWyS2NuaI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index 4f363d8b6c..b0c1cd66ed 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-1Ct3VjqFuYFVOwb9tNrbEmz0PbIXdQhZqG9hUnYIk2s="; + cargoHash = "sha256-Z2A6DaARkffU7FABuLSTNeDLClRr4V21bD76ns8ueAM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/highlight.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/highlight.nix index 19f70ca8d8..a63ba5e7f8 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/highlight.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/highlight.nix @@ -5,22 +5,27 @@ pkg-config, nix-update-script, fetchFromGitHub, + IOKit, + Foundation, }: rustPlatform.buildRustPackage rec { pname = "nushell_plugin_highlight"; - version = "1.3.1+0.98.0"; + version = "1.3.2+0.99.0"; src = fetchFromGitHub { repo = "nu-plugin-highlight"; owner = "cptpiepmatz"; - rev = "v${version}"; - hash = "sha256-G669d13JBLdy/1RUXtgZkiQhjgn3SqV34VlLbQoVOzc="; + rev = "refs/tags/v${version}"; + hash = "sha256-rYS5Nqk+No1BhmEPzl+MX+aCH8fzHqdp8U8PKYSWVcc="; }; - cargoHash = "sha256-ZZyxRiAaazLIwWtl9f30yp94HiKao3ZlYJ6B/vK14jc="; + cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + Foundation + ]; cargoBuildFlags = [ "--package nu_plugin_highlight" ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix index f0af1af660..755285e550 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix @@ -9,7 +9,7 @@ }: rustPlatform.buildRustPackage rec { - pname = "nu-plugin-net"; + pname = "nushell_plugin_net"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix index 9245876339..7a290bce3f 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-Lwmz3OXezzUzNG4PLCI1W/yvg4hfJAdNgA/2RI3nRUs="; + cargoHash = "sha256-bpZphNYHx9LkEu9JlGrIkks2M99JRjc+skY8MqPHMJA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix index f6ad701697..bff93ef03c 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -11,10 +11,10 @@ curl, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-M55nMYsTlmJZWXaNPZJ3M7w34cxpZx49Ap+u1Pr/Htw="; + cargoHash = "sha256-4oSmt92nMIaSV7hLEBv5GIDYVmtT96O4qktO8ovdcBQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = @@ -37,15 +37,15 @@ rustPlatform.buildRustPackage { extraArgs = [ "--version=skip" ]; }; - meta = with lib; { + meta = { description = "Nushell plugin to query JSON, XML, and various web data"; mainProgram = "nu_plugin_query"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada aidalgol ]; - platforms = with platforms; all; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/skim.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/skim.nix new file mode 100644 index 0000000000..5edc8483ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/skim.nix @@ -0,0 +1,55 @@ +{ + stdenv, + runCommand, + lib, + rustPlatform, + nix-update-script, + fetchFromGitHub, + IOKit, + CoreFoundation, + nushell, + skim, +}: + +rustPlatform.buildRustPackage rec { + pname = "nu_plugin_skim"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "idanarye"; + repo = pname; + rev = "v${version}"; + hash = "sha256-3q2qt35lZ07N8E3p4/BoYX1H4B8qcKXJWnZhdJhgpJE="; + }; + + cargoHash = "sha256-+RYrQsB8LVjxZsQ7dVDK6GT6nXSM4b+qpILOe0Q2SjA="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + CoreFoundation + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.check = + let + nu = lib.getExe nushell; + plugin = lib.getExe skim; + in + runCommand "${pname}-test" { } '' + touch $out + ${nu} -n -c "plugin add --plugin-config $out ${plugin}" + ${nu} -n -c "plugin use --plugin-config $out skim" + ''; + }; + + meta = with lib; { + description = "A nushell plugin that adds integrates the skim fuzzy finder"; + mainProgram = "nu_plugin_skim"; + homepage = "https://github.com/idanarye/nu_plugin_skim"; + license = licenses.mit; + maintainers = with maintainers; [ aftix ]; + platforms = with platforms; all; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/units.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/units.nix index ffb231c2be..0bc8304a49 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/units.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/units.nix @@ -5,6 +5,8 @@ pkg-config, nix-update-script, fetchFromGitHub, + IOKit, + Foundation, }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pxA+6E5luFHq/N0K/8Xk2LapwDnPqDUEpTYqP/jcc3s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + Foundation + ]; cargoBuildFlags = [ "--package nu_plugin_units" ]; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix index 3de359d15b..9e25be460e 100644 --- a/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix @@ -11,6 +11,9 @@ let emulator = stdenv.hostPlatform.emulator buildPackages; isCxx = stdenv.cc.libcxx != null; libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; + CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}"; + CXX = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}c++"}"; + READELF = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}readelf"}"; in stdenv.mkDerivation { pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; version = stdenv.cc.version; @@ -20,38 +23,38 @@ in stdenv.mkDerivation { echo "With libc: ${stdenv.cc.libc.name}" >&2 set -o pipefail - NIX_DEBUG=1 $CC -v - NIX_DEBUG=1 $CXX -v + NIX_DEBUG=1 ${CC} -v + NIX_DEBUG=1 ${CXX} -v echo "checking whether compiler builds valid C binaries... " >&2 - $CC -o cc-check ${./cc-main.c} + ${CC} -o cc-check ${./cc-main.c} ${emulator} ./cc-check echo "checking whether compiler builds valid C++ binaries... " >&2 - $CXX -o cxx-check ${./cxx-main.cc} + ${CXX} -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found # in libcxxStdenv echo "checking whether cxxabi.h can be included... " >&2 - $CXX -o include-cxxabi ${./include-cxxabi.cc} + ${CXX} -o include-cxxabi ${./include-cxxabi.cc} ${emulator} ./include-cxxabi # cxx doesn't have libatomic.so ${lib.optionalString (!isCxx) '' # https://github.com/NixOS/nixpkgs/issues/91285 echo "checking whether libatomic.so can be linked... " >&2 - $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} - $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 + ${CXX} -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} + ${READELF} -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 ''} # Test that linking libc++ works, and statically. ${lib.optionalString isCxx '' echo "checking whether can link with libc++... " >&2 - NIX_DEBUG=1 $CXX ${./cxx-main.cc} -c -o cxx-main.o - NIX_DEBUG=1 $CC cxx-main.o -lc++ -o cxx-main - NIX_DEBUG=1 $CC cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static + NIX_DEBUG=1 ${CXX} ${./cxx-main.cc} -c -o cxx-main.o + NIX_DEBUG=1 ${CC} cxx-main.o -lc++ -o cxx-main + NIX_DEBUG=1 ${CC} cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static ${emulator} ./cxx-main ${emulator} ./cxx-main-static rm cxx-main{,-static,.o} @@ -60,18 +63,18 @@ in stdenv.mkDerivation { ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib - $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} + ${CC} -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} ${emulator} ./core-foundation-check ''} ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' echo "checking whether compiler builds valid static C binaries... " >&2 - $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ${CC} ${staticLibc} -static -o cc-static ${./cc-main.c} ${emulator} ./cc-static ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") '' echo "checking whether compiler builds valid static pie C binaries... " >&2 - $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ${CC} ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ${emulator} ./cc-static-pie ''} ''} @@ -84,47 +87,47 @@ in stdenv.mkDerivation { # Make sure `--` is not parsed as a "non flag arg"; we should get an # input file error here and *not* a linker error. - { ! $CC --; } |& grep -q "no input files" + { ! ${CC} --; } |& grep -q "no input files" # And that positional file args _must_ be files (this is just testing # that we remembered to put the `--` back in the args to the compiler): - { ! $CC -c -- -o foo ${./foo.c}; } \ + { ! ${CC} -c -- -o foo ${./foo.c}; } \ |& grep -q "no such file or directory: '-o'" # Now check that we accept single and multiple positional file args: - $CC -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} - $CC -o positional/main -- positional/foo.o ${./ldflags-main.c} + ${CC} -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} + ${CC} -o positional/main -- positional/foo.o ${./ldflags-main.c} ${emulator} ./positional/main ''} echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h - NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c} + NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" ${CC} -o cflags-check ${./cflags-main.c} ${emulator} ./cflags-check echo "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib - $CC -shared \ + ${CC} -shared \ ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} - NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" ${CC} -lfoo -o ldflags-check ${./ldflags-main.c} ${emulator} ./ldflags-check echo "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2 mkdir -p std-include cp ${./stdio.h} std-include/stdio.h - NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} + NIX_DEBUG=1 ${CC} -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} ${emulator} ./nostdinc-main - $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} + ${CXX} -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} ${emulator} ./nostdinc-main++ ${lib.optionalString sanitizersWorking '' echo "checking whether sanitizers are fully functional... ">&2 - $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} + ${CC} -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index b34add9483..e300672ddc 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -30,6 +30,8 @@ with pkgs; (filter (lib.hasPrefix "gcc")) (filter (lib.hasSuffix "Stdenv")) (filter (n: n != "gccCrossLibcStdenv")) + (filter (n: n != "gcc49Stdenv")) + (filter (n: n != "gcc6Stdenv")) ] ++ lib.optionals (!( (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64) && (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) diff --git a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix index 4d3e320bee..73b24698ff 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix @@ -38,6 +38,9 @@ buildPythonApplication rec { export LC_ALL="en_US.UTF-8" ''; + # fails at checkphase due to the below test paths + # disabling it specifically does not work, so we disable checking altogether + doCheck = false; disabledTestPaths = [ "mycli/packages/paramiko_stub/__init__.py" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index ec0c73998f..b362c5f65b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,160 +1,160 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.136.1"; + version = "3.137.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.136.1-linux-x64.tar.gz"; - sha256 = "0c9gy58mcb14m7k497k01sl3vryvifg563vky8m9yhq4bhrasadw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-linux-x64.tar.gz"; + sha256 = "0q2c00gm4vf8h1kl3mh4xkcchvhb1kh4dpn7z7q9lgvsc2yphl56"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.25.0-linux-amd64.tar.gz"; - sha256 = "1crjmgzg0xf50xm4gpcb2i5nirgamgqf5r5x4nzp1k4v7106r1j1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-linux-amd64.tar.gz"; + sha256 = "1a5m5khddsbipkqb4ijfj2l3hs591in6q7v2i0d2jwazbyfkqdh5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-linux-amd64.tar.gz"; - sha256 = "0xhscn5nblmy3z4jnb3wrmg60cf68kx046vr2nicdvflf5bampf0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-linux-amd64.tar.gz"; + sha256 = "0l5fy9gcmzb11q6sp7yqssfan2i804l2ck2rhfihb07kmdrgn4sh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.0-linux-amd64.tar.gz"; - sha256 = "0fikhwjs3mza7fr9sf5yq416g9v62l5pzmk570137m3sbqr3y2df"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-linux-amd64.tar.gz"; + sha256 = "0yh44xnink15ajqgq5bckp23z476qfdxwj5r4slqkjj7sc5zaqzy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.1.0-linux-amd64.tar.gz"; - sha256 = "1wiy7sspn1q3pai5xzqs4yw3ywxj4651lwjjanz9a1ianx662whw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-linux-amd64.tar.gz"; + sha256 = "0d2mxvi1b801aviaj7i02c46xwh2wgzysd9yfd3s4rm1pg5j8kzk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-amd64.tar.gz"; - sha256 = "0qfkbwbkgh828hxgr64z8mkf6hbpqzwdfc2q6b1r718g647cm7nb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-linux-amd64.tar.gz"; + sha256 = "14dgblnqwdvz7hhwmxymldfi06ka864g3h2812mbypmlp8wkqb0d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.55.0-linux-amd64.tar.gz"; - sha256 = "1pncb4z4rds67npa3k5s9jb8gnjf33jb4c6s61s6f3vf4mh0nycd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-linux-amd64.tar.gz"; + sha256 = "0g82g9j5vqkf0alnj128a1m5yabjrj4gggq3g8p7yixnxkzxfazr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.5-linux-amd64.tar.gz"; - sha256 = "0barrb8hy1llggqmkbf4y33bixkziynxj8j3dwwmbl4la9qrc8z3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-linux-amd64.tar.gz"; + sha256 = "00r0ngvlqfmc2fydb9qc5r5s0rkws4r96i7wvrmmxsxhigc2g9w5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-amd64.tar.gz"; - sha256 = "1m7pif65wv083zvfxdyc3bpq7dyv4whpqi9k9p8d9gb7zn93piz8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-linux-amd64.tar.gz"; + sha256 = "0vg0fscvqgpiakfyhsazfyix679lhhwvixxqwr1q0c97whr0m51g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.4.0-linux-amd64.tar.gz"; - sha256 = "1p66ljsd8gd3v8hmsqiy8rf0n2afkbv05qbwlsbc8q1h9m96hdyh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-linux-amd64.tar.gz"; + sha256 = "05mxaq65a7p0va4268wq57shd87iv6bv00x288bsfp2ldz038ssy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.40.1-linux-amd64.tar.gz"; - sha256 = "0x5q9nr07iwzkgjh278nkwr6j0n9mymwwmayrcqv7v881pv505hj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-linux-amd64.tar.gz"; + sha256 = "1d0mn5kd86clwlwyizq04d1yf9a4ri63p5b0d1wsaprzdcdsdz1g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-amd64.tar.gz"; - sha256 = "1b5iyp0rld41mpin4w297p6q17kb3ya9sv5rsfg9iqwpbsz5c0vf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-linux-amd64.tar.gz"; + sha256 = "053bw7fy26w89mmr850jwwi81kx94d1i2vmymdwh28fjvkldq32j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.0-linux-amd64.tar.gz"; - sha256 = "09fm2f6sxfqwgm9fxzgdh9l8r3xqvw3kipm9p7wlaazvsysizck7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-linux-amd64.tar.gz"; + sha256 = "0aazshisk8ap83zvj2jgjhxv6841zyf8v582f5gag4bag2fifywf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.0-linux-amd64.tar.gz"; - sha256 = "130pqril3fmqlbfmwq4f982jkckzwsj79cwzg8f1696yazpfyb78"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-linux-amd64.tar.gz"; + sha256 = "1k56f68mld5rilwhn58zai8n9vp08qwmpg864gx08q4qfk0dzzfl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-linux-amd64.tar.gz"; - sha256 = "1kf2nx4hdaq116581jkqq2dz2xc57jbmyhrr6n8wwk0xlk3csabd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-linux-amd64.tar.gz"; + sha256 = "1pjn8xayzbns74wjf29wc3inydzbb48dhdg2gh8swzzynwkh779r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.0-linux-amd64.tar.gz"; - sha256 = "1bwkpwmpp5vj3by0i43s3sm3grxgagfwgk11fqhp1i2mxwxhff2z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-linux-amd64.tar.gz"; + sha256 = "1ldwvyhx7fykny4knzzsnqz4vvj93xrjc576b2ssrs7d9c24zm2f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.5.0-linux-amd64.tar.gz"; - sha256 = "1rdrrn8353p7zqajyz8d1c6jrn6xl76ai7zdvvbmnakfd31d7dvy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-linux-amd64.tar.gz"; + sha256 = "1hqi96bxvbq5jrsrhv17slbfp8k2lphdk4lkz59aj6knfq9gp9hz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-amd64.tar.gz"; - sha256 = "1qn8x8k4gn5qr9h5r5a1pj2x9fvpn3ass9g4xdqcdfrvi8x1xn3v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-linux-amd64.tar.gz"; + sha256 = "0vrrbvr2n2f2jlmqb81snhf0xacz4r1ym7cqs5gnkx9swb427qgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-linux-amd64.tar.gz"; - sha256 = "0p2nfj8zzsqnyrwmn9w7xisr859mjx0fh6gkp7bf618k49f0wpsj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-linux-amd64.tar.gz"; + sha256 = "1wyizcyj7wjhbqkbh5p5v01l535m6c3zgm47ym334y389amnng83"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-linux-amd64.tar.gz"; - sha256 = "0fyqax485v7p0wiwrlvw0dp1zhkhymga2va7hx8k1mx3gc3xj1md"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-linux-amd64.tar.gz"; + sha256 = "1ippk47y3018rvl05bwhcjwhd942fmiam1w0s2ys3l3jky2n1pvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-amd64.tar.gz"; - sha256 = "1c19ylgpigrcflaklyk5dd0qg2b5zpn0gn5nm9brxy5za2k60n3f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-linux-amd64.tar.gz"; + sha256 = "12lq2zpmyvp3amfv5q0ikh1000fdnmwlbg8qrvmaijb18zs1308a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.1-linux-amd64.tar.gz"; - sha256 = "0j6v2mzcfjdghv7rfhddlz85ggb3xipbm2yfmj2srh2yyqb0njyf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-linux-amd64.tar.gz"; + sha256 = "1q8vf0anvyhbq0fzkkmgrycay90izdfhyrragvn1ns9hpn4rxwd3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-amd64.tar.gz"; - sha256 = "0nchp2xi6kbrkym16688dszihln68hnj5v1ilw027d40swj4xdv5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-linux-amd64.tar.gz"; + sha256 = "17zsq2qhkhlikjvil4rwcarydkdx3v8w95s414mcvgsfyrj91j46"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-linux-amd64.tar.gz"; - sha256 = "0p9lcq04nml7rcpd7kpciqcw2y1fb5igmq6k71mghz080y3d3s3y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.7-linux-amd64.tar.gz"; + sha256 = "0vq7q9jnr3ikbvnf7n8vp1264c0ff2w6nfrs1lmfvn1jzr831hw3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.0-linux-amd64.tar.gz"; - sha256 = "0av5dkazi3ymjp2rhszyp9vimd89v8dm18lvvr9adq2c1v1r9rzn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.1-linux-amd64.tar.gz"; + sha256 = "0jp5dbjr4f8r51y0nkv62r3rxl476lb6aqkkhr2n56gakfz1rbn7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.1-linux-amd64.tar.gz"; - sha256 = "1pya0gy59jph6m0c3calcf5bx7zymf9gvfqiz4qlmrfasn80jpkn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-linux-amd64.tar.gz"; + sha256 = "0ak0jvcw654153xqi8byaa6g928ca00mzn9v3a8a666rfrknr7pn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-linux-amd64.tar.gz"; - sha256 = "126fwbm2zbq55c7jsb4xqgdq1r8v9giaqx2isj05vrb4pgljbwz4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-linux-amd64.tar.gz"; + sha256 = "0v1khy2xjjv0abxqjam5diiiwli0dhbjkpf85li6l4ay7g19c9m0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-linux-amd64.tar.gz"; - sha256 = "1v317rlj7gmcdb74zlnmz668qn4d1ivl7dx81gw0lmqba73i1pdn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-linux-amd64.tar.gz"; + sha256 = "088bfkpsq0zyazpzyxmji9brxyirxw12adc3pl9f5nc044p5c5zx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.0-linux-amd64.tar.gz"; - sha256 = "0lbwy5bd87yivfzsj97jm43f8s4xmaph00n9sfdl423fzrf7lyvr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-linux-amd64.tar.gz"; + sha256 = "0fmz1baas0p7nvk6yglpx2z155303j3f0l5f4zaq6091jk9ly9dp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.5-linux-amd64.tar.gz"; - sha256 = "077nki638hs165idpz8i9jiw18nw5vn7h7lr1f967h86yhhhxbax"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-linux-amd64.tar.gz"; + sha256 = "1iz28rvprpdvx0fp4gdwp1g5g0hzl778lbb8fanyqrnvj39hjg77"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.2-linux-amd64.tar.gz"; - sha256 = "02fbxvapmmw0b4gk6753zl66rnm154mb8p49hmm47ry1rf45isr8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-linux-amd64.tar.gz"; + sha256 = "0jxcq9h5jpmzwnbflzihgi6f9bi7z13064vsyjl1sl0swnfmgjpx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-linux-amd64.tar.gz"; - sha256 = "0yyarc6nnsy8mr5yvz1gfyhhcnhpd4mmqpzai8zrfs12hsl429s2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-linux-amd64.tar.gz"; + sha256 = "0k39k15k1rzcrw1k30683b8zhfp41r90zi6mlzivbbnszdjgnbml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-amd64.tar.gz"; - sha256 = "0dmx29ldms7mwhi4ka9qnz53qkis29diyz4g06hbnkc6j1bdc7jn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-linux-amd64.tar.gz"; + sha256 = "0aannlrhij2jmv9l6mxgy08vw7i16mg3jyl3wdb9mygg8irmllmy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.3-linux-amd64.tar.gz"; - sha256 = "06lkz2py4nspqjn30zqw873ff8d9zc9jrjzjg945w54s2hfl0438"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-linux-amd64.tar.gz"; + sha256 = "1syqjpkn1nz05hlw3i09sjwrk81l42p61g09ml9afyc9pslkqhcl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.4-linux-amd64.tar.gz"; - sha256 = "0jsr0bww1gq9y1fvsxgzy5ck1q6pwmpj9lb9dsbgdn861flwy3g0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-linux-amd64.tar.gz"; + sha256 = "09swzcgkagv9ar6j6p026hywjwhhiqr9pbcgzdby0nzbvx2vigkb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-linux-amd64.tar.gz"; - sha256 = "0qz3vzgc9g4lwb7c0sdm075lcwjahqz6indnnma3ljbvpq3r92bq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-linux-amd64.tar.gz"; + sha256 = "0lkmhbs5g26x7y6d7lznp1c6cpwmyq2v2anajkfnmirgv8rccyji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,156 +163,156 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.136.1-darwin-x64.tar.gz"; - sha256 = "12wih8dgzrcadz77qdz72rcx3balhbwldlqv25rkh33bzxfd1vzl"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-darwin-x64.tar.gz"; + sha256 = "1dnzlms1bd7d9xmphgnx7q5vf8jagcrav8qlg4j8iac1ksfsjj2j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.25.0-darwin-amd64.tar.gz"; - sha256 = "0cmyzr7knm4hb0w78y5dfia1wa1bvbr5gakfp37mxv3v523j19n9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-darwin-amd64.tar.gz"; + sha256 = "08p0kia600qpqfvwsyc0y5czf3wjz234s4al9hjpv340s32a9p4f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-darwin-amd64.tar.gz"; - sha256 = "0w86imx8sv53r74bgi5fjjdr6dj30jf0sdl17jxakch8z09yrnai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-darwin-amd64.tar.gz"; + sha256 = "1ld0qnckwm6fkrr531vs5ay7krhpznhgk1193g231l0b0hb9lm3w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.0-darwin-amd64.tar.gz"; - sha256 = "14rl80bn8kk9pwmsicwgkanw00zhpmfrnlwkf6w0s1l4hvg4mfm9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-darwin-amd64.tar.gz"; + sha256 = "1xy1clkllxdgay9jpa1klq76kvn2yhb4zlsr9x6q2wga3519k0r0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.1.0-darwin-amd64.tar.gz"; - sha256 = "12p7qyc9lqrk45d1ah7qdvcss1sw0ai7jmq99q14yb1ha4hdagdh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-darwin-amd64.tar.gz"; + sha256 = "159ikg6hzkksggsjna4pffg912vfiy6p6r4w0pwxxjg4bws63a5n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-amd64.tar.gz"; - sha256 = "1hqcr1yhlc8m99w8z0i3mr3wnvnldkbwni4v5s1r11blpzqrwa0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-darwin-amd64.tar.gz"; + sha256 = "1ilqm6cjyhi7l7wdjzdzr5f8vsbn4s7lzfm5787yaks8wxzzr9d4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.55.0-darwin-amd64.tar.gz"; - sha256 = "040kiqvsmly8jvlnh24hll596ccqyxh46fb0gqbpnnfhxkpkp5iw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-darwin-amd64.tar.gz"; + sha256 = "16pvhcda0273v1j1whx7x3ix1npr4izb067d0j115c5cxygab2wl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.5-darwin-amd64.tar.gz"; - sha256 = "0mbh4b3rwwyn21bxh8940vslnl93xjjx4f13283hja596s7ba2bi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-darwin-amd64.tar.gz"; + sha256 = "11gfaxk8vgk95crb45g43r8gyg43azq7qk3wzk7kn7vyvzdkq0l6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0zib88z73ha81isxajkwjbigl2f51dj1d7zwvk2ic9qwvrimvb2m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-darwin-amd64.tar.gz"; + sha256 = "0vgfhlqmqxwdy1hf7zsdaid9ac1w84yc2fpgbvp2d3kqvp2alicr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.4.0-darwin-amd64.tar.gz"; - sha256 = "1m3zjv31n33k400z2dia70xxyvfg56hbw240lw8kcq6sg3g7ar8z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-darwin-amd64.tar.gz"; + sha256 = "0m6ghahdr9z1z1493psr0ybi8xhbbk5wk2fdsa8cf4jvai3pzj2i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.40.1-darwin-amd64.tar.gz"; - sha256 = "1byivrnyyd33dr4gl3rgkli2rj7f70anllzmjgwlsi5yl11fx2qi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-darwin-amd64.tar.gz"; + sha256 = "066shndil11f4mj35v7h6ppdb2paaf9y6rgpvs024kh3bg66rgvi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-amd64.tar.gz"; - sha256 = "1bgq98jiaqhvgbywvydpkif154k6rlzk0sqn55bj0ng9f04vz2ka"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-darwin-amd64.tar.gz"; + sha256 = "1fayqzcyda8q0fr96gqbi2y6r9ykx8agb57wnqffhl06ay6kgji4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.0-darwin-amd64.tar.gz"; - sha256 = "077x6p3ypjd8x0yz22yy00iki9gdwjhf71gm38aq6lfmzhgqj73r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-darwin-amd64.tar.gz"; + sha256 = "02130bdma9zhmc3jizgmdfnly5bddajxv5qcl0kxp7xs7r37vl3p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.0-darwin-amd64.tar.gz"; - sha256 = "1cpa9757dk670wzx3545qsczrsa2gq0rq1r5nj61fw29vzfz409c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-darwin-amd64.tar.gz"; + sha256 = "060fzxp4d2ll1sqrbd7840bbb7zim7qz8kcadg7h7i40nv0853s9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-darwin-amd64.tar.gz"; - sha256 = "109lm7b1q6m0j4fkckph6nz33xl2sv7vz1z2vzzvm70aallzw5ds"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-darwin-amd64.tar.gz"; + sha256 = "0ipi6z8gwrlqaxxqililmw626h68gwzp1w3bhhf9rzka4p0pdw4k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.0-darwin-amd64.tar.gz"; - sha256 = "18fgwnkz7mghpxaxph30m8wq1w1k22qigj56chlcybvfldfqj4xj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-darwin-amd64.tar.gz"; + sha256 = "18g2lbnjhfbbqmkmp23g7dgj2kfxcr577arss3ycx1dbalhabgyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.5.0-darwin-amd64.tar.gz"; - sha256 = "1aqh0s9zq6bni1sa2gmav6xd1rnsh6xq3zcrwcpfm2n8gzpyslm4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-darwin-amd64.tar.gz"; + sha256 = "0laifnya9jbp3dw1ml5i66apxkn79j9c37isncmb6v58cgxkb20d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-amd64.tar.gz"; - sha256 = "162y9zyjwqzhh9ahph8vn9zmca8xc123hrybmhlhn6srj5sqjldh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-darwin-amd64.tar.gz"; + sha256 = "0pyjavhsblvfigaz80j5lh1dmlj3g42r4v6b92bjw45392dfh9v7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-darwin-amd64.tar.gz"; - sha256 = "0ig0l2jfl5n6afsxni9yh8dy3m5rnafckhgfcpk054iw1kfz5qbm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-darwin-amd64.tar.gz"; + sha256 = "0wcndd5y60qqml980i0l7cckf66df2x3qb2s4sydnqw822fwhjy9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-darwin-amd64.tar.gz"; - sha256 = "0i5shs8mc7rynwvix4dcs8ks94jkj6ir2kwhzkb8g3l3gjf6kk7n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-darwin-amd64.tar.gz"; + sha256 = "0l1cndf2bcdc2492dm76sfad1m6xcbhqh4vkxahckflpy296pqmn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-amd64.tar.gz"; - sha256 = "0hjmvd26a0fpsbzkyhafmj92jjr26lz1yr93gn2idhnzn9vg2d95"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-darwin-amd64.tar.gz"; + sha256 = "0d2w10acsann0wayh13930wm2cirnrzzrs9xfbp7vxf3i3v3qvwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.1-darwin-amd64.tar.gz"; - sha256 = "0vy0idda7qhkpxalmxs1v13dhb97fcdwwkgdpcs7w0kr4m291vr5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-darwin-amd64.tar.gz"; + sha256 = "1iwnh05qrwr0xjl1q94sm0iv88klqnf24cv3fdqjz0s5wy69xpk8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-amd64.tar.gz"; - sha256 = "0w956b6hlacsnpi30frnxj5a389znj1bkryagv2mcmc0ci8zpy0m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-darwin-amd64.tar.gz"; + sha256 = "027dp8cqyqjvp1rsg2mxsfsbr7bn4gkkx8i7x4gc3w2qs7icp3z9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-darwin-amd64.tar.gz"; - sha256 = "0d4n0gg9qc5f4vpid3za3mzp8yd8saz8akjlli992cql278w10jl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.7-darwin-amd64.tar.gz"; + sha256 = "1wvnpgmjr7qqjzx0pclrb3gmbdw5wpqdmsac7f9rc1i25xhjv2f3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.0-darwin-amd64.tar.gz"; - sha256 = "1kz7d7bg3l5vbkgxx9y9889i3kv0yw9dnf5f830haxwi41dq16yg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.1-darwin-amd64.tar.gz"; + sha256 = "15057d3s3d7rwy3lwjlrr25ahrqhkpwla2pn58bkcwxfm6kkfrch"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.1-darwin-amd64.tar.gz"; - sha256 = "0gszimgczrn7gxziww9kv9k53iyg2npb614kl5251bcqr3kkir4d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-darwin-amd64.tar.gz"; + sha256 = "06qaskczdf8bbp0z6k1q015hd313g4bxl1x9fgc3aywjqafgw2br"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-darwin-amd64.tar.gz"; - sha256 = "1i9ybfvd7k4v5klip2wxm1yh2whxpp39i789zxp0g3wk61c16mxq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-darwin-amd64.tar.gz"; + sha256 = "0lyb9bxsmv5zxryjnil4wh490xngwn1hq8aka2sazr02jsrql098"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-darwin-amd64.tar.gz"; - sha256 = "0azl4v8lrj62855lzjf9js7hgvirwsy9821vabwdfmd9pzl3x5bn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-darwin-amd64.tar.gz"; + sha256 = "0haii3k9b99qxd0apw9smks1zamq5y69vfiyzn7ylvcj42xnc2aq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.0-darwin-amd64.tar.gz"; - sha256 = "0gfihzx3gf0mfjl8x7hgrb26q9pfrmxhdknd673y4bcy367msxaa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-darwin-amd64.tar.gz"; + sha256 = "0012plwfj18zqv4d55d1f47a7xnb88bgpshnj35izxrjzsagppvp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.5-darwin-amd64.tar.gz"; - sha256 = "1rk3nfc5mjm6fdl7qcz5bijplh4yzjwqg4wip85vpcx2m25k1kz3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-darwin-amd64.tar.gz"; + sha256 = "0m31jd9aln89jd6hz7fvxa8a9hnkkkliiiyayywvi4ab2p1fchcy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.2-darwin-amd64.tar.gz"; - sha256 = "0b6r35myj0dkhf3abx1f49s66hvyldv1a230sn7l9ighlfayjbni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-darwin-amd64.tar.gz"; + sha256 = "0sa7r49zdk4jy9qifw78qqvp4id6ycl96378p7333x8g7jlv5ich"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-darwin-amd64.tar.gz"; - sha256 = "1yqmlpb9xmbagzbm9xqzskppkprvpq1ff64kl1y3mn85iizqwkgl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-darwin-amd64.tar.gz"; + sha256 = "1llbp6mda1ibd557d84mg9ck891y1jxdx11i33vav3ndnf2xnw8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-amd64.tar.gz"; - sha256 = "00l1ybf0a2bjkvd10db9ilyxq0zpv55r3wdy7s9dklq2bagmqzjz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-darwin-amd64.tar.gz"; + sha256 = "175zy697cvhsdm3b2vhd6rac3fz8p6ck8a2nw1wg9ahq2v7f8232"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.3-darwin-amd64.tar.gz"; - sha256 = "0wwq2883q3z4ngjzif1s9hmc3wmwfiy5gpc8i4dcn67add6n7sns"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-darwin-amd64.tar.gz"; + sha256 = "04sl6rivgprh65c459b6xazpb1dbzimvczwj62jpra275qgbl0p8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.4-darwin-amd64.tar.gz"; - sha256 = "1p0sbka8hdak0wvdy6dm97hp4d6bx0c5zk5pj830g0hmb1a7gazz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-darwin-amd64.tar.gz"; + sha256 = "0kfzqg8fidras6kf0f7dd9bfc2fyl15b9qch27fq32zy1baflvj5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-darwin-amd64.tar.gz"; - sha256 = "0h1ay2zpq8yll6w1myk3pjg2vvkhscsiqsjh1gwq2vp3xvd3m9j8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-darwin-amd64.tar.gz"; + sha256 = "1hnqdbh1k17injwxrj2rd2rnx2zzm76fgjf0z20d2qlzv455pvad"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,156 +321,156 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.136.1-linux-arm64.tar.gz"; - sha256 = "1w9x21v8nkdni2cfhn396iza84zqanvpgszphqx8xgy4s2hfkz5g"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-linux-arm64.tar.gz"; + sha256 = "13kmapsij72v0rfgrayz7zi9z9awzb0l9jqx7jkbvy1cvd6mnmy4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.25.0-linux-arm64.tar.gz"; - sha256 = "0mjkc3nvlnxink4xzj583m75pbkn6ka7ma7gqz842h4kr3sr94ch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-linux-arm64.tar.gz"; + sha256 = "02r2snp8vflp7b58yzvn3clq4im86h9mnk6m6xj0cgi92nr3lf29"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-linux-arm64.tar.gz"; - sha256 = "1cd1gkfn8sfdpzlax1hx3kqq65nyiyjl8rbkillr82ldz46rqbgr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-linux-arm64.tar.gz"; + sha256 = "1h465gwiwrc7b7nq5s7x98gdhnrz08ng5ymzjsc0qam46dasgpwl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.0-linux-arm64.tar.gz"; - sha256 = "0ai86b4z3m7k674xyhb9nsk3rw64zydws2qnxd6gzbqvsz1h32dz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-linux-arm64.tar.gz"; + sha256 = "12a6bcn40csxi134r5rmz8qshc5qr8gl15gr2mx7sq53d7sjkl98"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.1.0-linux-arm64.tar.gz"; - sha256 = "0y0397lnsfpbq3gd825rg46abp879ar2lrj40h1xjf1yirbrj88m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-linux-arm64.tar.gz"; + sha256 = "0687dhw0i3a4asivff2izdm3l76qvxlgsav3h0q9zjqllgkaqzwp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-arm64.tar.gz"; - sha256 = "0h7ngd0zblvgf22m563p7f2y3kpqlvn5kqvb6psz3ixa8k4klmz7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-linux-arm64.tar.gz"; + sha256 = "06i2zw9jblcmk6k2a1vqpqv1d9ndbs28vsdijfvkf9sdhgb7jv80"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.55.0-linux-arm64.tar.gz"; - sha256 = "00nv07j0hiva5cf6jylaip30zd5qsaibmz4vwa78hyr0jshmh2jx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-linux-arm64.tar.gz"; + sha256 = "0wchfgrrfpwgbv9j9hn3rza59lfaggp6n76rfxlnnsg2n47f2iz1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.5-linux-arm64.tar.gz"; - sha256 = "02nigbhnvwv4bqsfz99lm5pn469y8yaz88d9wq4dr9gbxm9fq7vk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-linux-arm64.tar.gz"; + sha256 = "127jimzckvk4jd3k7fn9a7pi7i8z5069xnpa4dv02fchpw0hwpi6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-arm64.tar.gz"; - sha256 = "08hd9b9vbbcx15bpb7vlrsjkw9ak7sjarqlxv4sx1fzys682nwra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-linux-arm64.tar.gz"; + sha256 = "0h7pd02jbpmmdd4wnknf36z61cw5xf939nadia6djd345vnlbwc3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.4.0-linux-arm64.tar.gz"; - sha256 = "0627b3f0wg7bj4n2ghayqb8hfn3vq020ybzcsxmyg0c77avhcvyz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-linux-arm64.tar.gz"; + sha256 = "0i3nsz9liyp02ynghl2zgi16di6nrwjbd1pcp1bxnyrfbn05a3q6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.40.1-linux-arm64.tar.gz"; - sha256 = "0nid3yn8x0791bvxz54z1fblv67c2x6gjlhkzwk7xr35lzifn71v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-linux-arm64.tar.gz"; + sha256 = "1y8c8nkkxsq8866xr0pp3ahrbsqq00j26pi5d7fpaycacslazvxb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-arm64.tar.gz"; - sha256 = "0j53qafafq8s4rxds8anrsyylyjx6gd3jhrz16zqs4hcxwiimcfp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-linux-arm64.tar.gz"; + sha256 = "0g41nc7c5szg8a7hyqf0apji6pm9v5zk389y3ajdz8116a4p83v2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.0-linux-arm64.tar.gz"; - sha256 = "1rrk94dhm8pxdb7rkmkir1lxbhjsyx7hxkrcj5lkz7x1fnsb7ivy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-linux-arm64.tar.gz"; + sha256 = "0f2c1lp0pyc9wvnqqg633822m466vwiqfgf4swv46kad4gbsqyq9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.0-linux-arm64.tar.gz"; - sha256 = "038i7lcmi51gmz8393sjca7vql3f59bjl3v7xbfncjzcaffhaw2w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-linux-arm64.tar.gz"; + sha256 = "1d0abcsdji08mf08f3q6n4qhifny7rrb8mynhhikq1ahp2c9mdhb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-linux-arm64.tar.gz"; - sha256 = "02p2mky012wizmbn1xzaq6ca3bqj7nslydn7shyhygr4lx72zffm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-linux-arm64.tar.gz"; + sha256 = "1495h4lrg9xm39cg7cfjkp70l6icdl0z71xgakmfbilrdzpg16wj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.0-linux-arm64.tar.gz"; - sha256 = "0vwpg6ilpi08c83mahfpsqrmgz2h0g3kl4zrlmk2qdxz17dwm723"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-linux-arm64.tar.gz"; + sha256 = "16mr8zh7br7a005fa7r2w12r4g30rgs5f59z9d7xgmw54cg4cqb7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.5.0-linux-arm64.tar.gz"; - sha256 = "1lz8cafpcvyjiy2gfglqx3ndcs2i7y0iaks3flvzhy2byfmjv50q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-linux-arm64.tar.gz"; + sha256 = "1g41hqnbw2fg1099hixh8icclgja6caq8x9qp87xm6lxaf0bljhg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-arm64.tar.gz"; - sha256 = "14jsk2s02idmfi8m832l62gx34g466zvw78z3g9pabnn4igr9ixz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-linux-arm64.tar.gz"; + sha256 = "0mv5hbi1lwp9z8bl1ygq7rkzcqxn0m12n6rfb0bkav8r64r0gp07"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-linux-arm64.tar.gz"; - sha256 = "03x6lb7dbwjz6a79f13br8mxl7wk2n6p7qafm4plmy9wdfxi0pz2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-linux-arm64.tar.gz"; + sha256 = "17279g5ks9m74l2gskrd9x53azq2c82q19cs4ihkxcwv9pzhfrpm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-linux-arm64.tar.gz"; - sha256 = "1ipnjv4nczfshndn0agayllgsavlhykq7ivvs6pq6mawaxz855mr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-linux-arm64.tar.gz"; + sha256 = "02iqynwshdz4jnwna2y3nnba6lpiwckd1r56wdlf0ar3nhjimlv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-arm64.tar.gz"; - sha256 = "04vxicmfwi72irkl5rp3jvj4qpxxz49z5fhgnfirhj5kksb6cggz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-linux-arm64.tar.gz"; + sha256 = "1788ghs55asgc0pn2jdxpzwbpgwi3mby7g7ii0xi4vw7ddvn2vcp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.1-linux-arm64.tar.gz"; - sha256 = "10gjw634zvb8bch91lh0g0k5q6hnn9jdhx826zy4sjwfz7jp60hm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-linux-arm64.tar.gz"; + sha256 = "07b347a55bif6b8w5ajg8da7z42k8sc2niid0w6s8j3llk404k7h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-arm64.tar.gz"; - sha256 = "1x3ayikdv1sdm72bmxhg55r4xbwmpjjhim30ajqid9fhq2c7zl1j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-linux-arm64.tar.gz"; + sha256 = "0sxg42qhaz36pnms0q2f15hchp2nmx30l40ylbsjbnf646ln0pkp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-linux-arm64.tar.gz"; - sha256 = "0g7fqm5z6msf7c0qh60f137qq7i1s103b64lbvjn06qms2xkd6x3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.7-linux-arm64.tar.gz"; + sha256 = "1p6c3bf5k9a55jw48n5asnbb9wsa75mjy8f3pkfsn584y7c820cl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.0-linux-arm64.tar.gz"; - sha256 = "174d5i7837warylyg30x9d28g79s114q8amm53afrli8bdhl2pjs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.1-linux-arm64.tar.gz"; + sha256 = "0sxhhzszpq2y7290ndlw3pj5h8rrdz556npmbly4v5q2yhcqfdw8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.1-linux-arm64.tar.gz"; - sha256 = "0inhpspdikjgwf0cxsx0z67vs3iix9plqrz4jzbzmwhknf0iscgb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-linux-arm64.tar.gz"; + sha256 = "142q0vc2d5kix8vxmg1fjj22wwrg5hlbfl5vzzm2689rghbchv1l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-linux-arm64.tar.gz"; - sha256 = "0gpsb70pc7whkz94fiqj1fs5fg8kp9bcscra6jr7hcs3i1xk0zav"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-linux-arm64.tar.gz"; + sha256 = "1gi918if5waxpn1y83knfd3b9v2wlswbxsq8hd2vynfq669l9cbg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-linux-arm64.tar.gz"; - sha256 = "033jmnkp92bid7jiwy1jzn6l18qg5lncmsrpjdnwwxlqb2mr7ml6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-linux-arm64.tar.gz"; + sha256 = "0lgr2a1rvdn2qnzb889s039f5cw77syrhgnprc6c2z59r60spv3i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.0-linux-arm64.tar.gz"; - sha256 = "0x5ywlcd10v56qbs0lj9li0ip1d02bg0g9khz9sk8gg79rzmscla"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-linux-arm64.tar.gz"; + sha256 = "0cjj4win1x4gmb729svwgfghfnl6yd95yxbdw13pdw2ppiq1vskr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.5-linux-arm64.tar.gz"; - sha256 = "0qb01jhffj0f2ay7xz7wycf75wi2kzfh5ljzf4s6jhs06b7d76qv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-linux-arm64.tar.gz"; + sha256 = "12rz9jsn6zyycik5a85xf9yfqwap8jmhz1y25v47c4zsix5k7f41"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.2-linux-arm64.tar.gz"; - sha256 = "0qd9jlm5v1c8x8fhjy3qabr8j1dkiycszfb9idy2y8h9q1bjslb6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-linux-arm64.tar.gz"; + sha256 = "14qqswq79hgiajqvr8r9fg0hcmgwrarbm8dhrkxg0msn98wx6xkf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-linux-arm64.tar.gz"; - sha256 = "05h9m466k0kqrdc6s83jyif9f9ihmpxd4fpk3z07y2lpk1qzzsz1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-linux-arm64.tar.gz"; + sha256 = "0scga9q0vjc4xcl7yirxmv1ghzykrziacninmv6fl7zsf41f5rvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-arm64.tar.gz"; - sha256 = "16j5vimwjksnjwfmgf8nkmja5g8pqi9hsw0mr8xndl61hsrawirn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-linux-arm64.tar.gz"; + sha256 = "181rqzw2qfgmc5wb57rmar56pmhapxmaw6vs6bqrsdmh6xf7sm10"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.3-linux-arm64.tar.gz"; - sha256 = "160fq9j1jb39lh0fgm14mcqr7y07gl3wr2gksin7b26l6p37n3h5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-linux-arm64.tar.gz"; + sha256 = "1rd21jdkc5q291b5gr6wlx6z5gcsk1b4fh1bqy5pc21pmg4a28bj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.4-linux-arm64.tar.gz"; - sha256 = "1wgy5h9gw4qmvz9pn25vnzajfhi9vgx5vlssgb0bd42qgrvscrc2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-linux-arm64.tar.gz"; + sha256 = "18x89a5ibizj6q40g6las35inyb831f1c5gl6364ybx7qslk94yp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-linux-arm64.tar.gz"; - sha256 = "0nj8k7x0kbsqd5mc83wsb3q0b0v91zsakpr49h6p7cjjwkcxmchi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-linux-arm64.tar.gz"; + sha256 = "1qnw3hkdywrbzg7inpcrri7nvniq0lqfkgfj2qlbfq9iy4w3rm11"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,156 +479,156 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.136.1-darwin-arm64.tar.gz"; - sha256 = "13b6ngip3aazfln3xzw58llxqmxgrsqmbswd5v6fiyla7kjplvad"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-darwin-arm64.tar.gz"; + sha256 = "0rcs5ybfzj99yv9k6zp38848ck3b8k7db426ckhcqxid1i5yp8bd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.25.0-darwin-arm64.tar.gz"; - sha256 = "0rxc6bdmfnixgzc8s876zzf714xlqzj9a2vkm8hvb0kb3l1qzxyy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-darwin-arm64.tar.gz"; + sha256 = "047x4cb9km62bh5451w24jvphxx49n447kb30799z39sp3nvyb71"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-darwin-arm64.tar.gz"; - sha256 = "1ynl9my3hv04b10sqsjd97hg2mr1p05f8p6ibqh278x40r4arv76"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-darwin-arm64.tar.gz"; + sha256 = "0p5brsbvvjf3kw9wz829b6fxzprbiwzh0w7sx342zsj6xpia3d7b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.0-darwin-arm64.tar.gz"; - sha256 = "15zjcp63sz39krxqyzzwsz7nlpp8vmwfq6709db0w5rwy76spvim"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-darwin-arm64.tar.gz"; + sha256 = "1h9yrahnmn96y58xc8cw55x0dmddplg023cplrv4k1vqqjzig4y4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.1.0-darwin-arm64.tar.gz"; - sha256 = "09vqma83appmx2w8mnkrbvgcv8nav45kfrj8w0d4a8qr9x2cxl2m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-darwin-arm64.tar.gz"; + sha256 = "12w3v61g7j3slzg59gkc8fwqzxpvwkfcdzdg0xrnnfr824xhr8b7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-arm64.tar.gz"; - sha256 = "1d6gpymsa5qjn03510pz61g774qh53v914hg2dm5kqrjzgb1mnvh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-darwin-arm64.tar.gz"; + sha256 = "041848mx22dqp4lkh4mxl6cjh3njl97qaf0aac5s34sw1xgj3lpw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.55.0-darwin-arm64.tar.gz"; - sha256 = "1p0fg6pjahgb0jfyzvxj1yqiznqpk4h44c7i2x6zfbmb2vhq1jyp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-darwin-arm64.tar.gz"; + sha256 = "17xzjnpgj1h9mzgn1jb5p7qa0fzd1cjj448yh3injvv84v5zkvb6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.5-darwin-arm64.tar.gz"; - sha256 = "0h40pmvpdqgd73nwmcl0y8cm7lq39gn1a8aqziy562aa6w8mmwlr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-darwin-arm64.tar.gz"; + sha256 = "0fqkcnznp08ikx7acvjnzyv601qy2z9b4896mwswycayn3w6cnd3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-arm64.tar.gz"; - sha256 = "1f9zy9rl8vmnc40p6cvcz3d5wrf52y5a798ljp87kmjmra0mglg3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-darwin-arm64.tar.gz"; + sha256 = "1wmbzpd94hnl40i1iqwsh4nng1j3hrjc7vkpnahir2763qc2ybsz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.4.0-darwin-arm64.tar.gz"; - sha256 = "1mhcrv6mxlvdqnljn9rjm448cg6w8vvjy4qw8pg563lkl4a87si6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-darwin-arm64.tar.gz"; + sha256 = "0dgpl861qhhahglyvkpnlncd364fr3lwwnx0nm62zy42dxp0gzsc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.40.1-darwin-arm64.tar.gz"; - sha256 = "1i16ib0akyi7ibd4nlh767wy40y921iflmkxx6jgwilxs3prkmbh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-darwin-arm64.tar.gz"; + sha256 = "1arlc8xpxjsjl7pvvbl00j3w64w9p6rkarp00c064r2d6yk0bavb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-arm64.tar.gz"; - sha256 = "17f53cknsyqm5r9glxmwc396y8bbl1khvg9px5ixr43gfgq4vm91"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-darwin-arm64.tar.gz"; + sha256 = "1mx299c36v4q419bjpvhmvkm0bfbia7d0v9ilpyzcxqy68y2irzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.0-darwin-arm64.tar.gz"; - sha256 = "01kr580gznlanx267map617cnj9yb64n0jl9l8b9l4sr2pgpy1yk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-darwin-arm64.tar.gz"; + sha256 = "1sffzffwp914977wpbs85r0a34fq3ww2b51pq7x0fbkp6gh86c2f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.0-darwin-arm64.tar.gz"; - sha256 = "13gqs7j8sn15cnlb45yifh2y9072aixrvycnh0vnsk3kjc915d8c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-darwin-arm64.tar.gz"; + sha256 = "0aif1cm29m93awsac1amh14pm4vbgizp6qq96baidva3v4n7gl4g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-darwin-arm64.tar.gz"; - sha256 = "10yx8pvg18537b7x689015y1xcm22zd2wn3hkirl236drk7rnapp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-darwin-arm64.tar.gz"; + sha256 = "121af32kxbb4jh65d333qbjwvy80z7vv3dnsajp3g1fi48l02jd6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.0-darwin-arm64.tar.gz"; - sha256 = "1i95ayzlsbw86k9iznpr6bi99df52ls0dn3q47p5492rxz2m26x4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-darwin-arm64.tar.gz"; + sha256 = "1zg3prszki0qxsinz4v5jqnng3z3s5f08hx3ji7v1mcd9mp97q9l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.5.0-darwin-arm64.tar.gz"; - sha256 = "0mrw4l7fgkqq6sqpflha9z32fzpqdfsp109jz4n7r7kxipw4pijq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-darwin-arm64.tar.gz"; + sha256 = "10zmlalprlf1m56ig60cwwmpnibr547l3bhmaicvnp6apv308z93"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-arm64.tar.gz"; - sha256 = "0jmdqpajx5c1nnc01qwyjp8gil71wp3k2ddj7ac2vh4m75341ki9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-darwin-arm64.tar.gz"; + sha256 = "06lnmwikkb2jzwbazqi9ca9mpyyxh2m85k3sy0cvfh8inyxy30yr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-darwin-arm64.tar.gz"; - sha256 = "1n7ip7zr69bz1fh92pvbspf8n1phhwgdcfb4yrasgc2skp4q9fa9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-darwin-arm64.tar.gz"; + sha256 = "0xy6my4f0g2nf7gd1sxk6flp42l1639mldrrdr2npngrdynf0dp8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-darwin-arm64.tar.gz"; - sha256 = "1nm9hc8lnc0l7mrqbry5prvdr66zcqhgzz4a4b6ipviir5r49lj4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-darwin-arm64.tar.gz"; + sha256 = "0lzhv6x2fqdrwlvi6s2ryab40c8nvy83xwza7iwksagdx6jpp3nj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-arm64.tar.gz"; - sha256 = "1gndidz869h2i6ig47a42nvqvzhsj8zzq9qlmb9z87gn2hxqfg69"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-darwin-arm64.tar.gz"; + sha256 = "106al70xil9gyxaqpf4kdw1r0cj8gzrxnd1mhgbd27kgmyqi7m5z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.1-darwin-arm64.tar.gz"; - sha256 = "1dzag9cj4gpqyf3lr649xyb4n9smc9vkiqd37mxcl0y0w7wxy0cq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-darwin-arm64.tar.gz"; + sha256 = "0p1yj1ammwcx0nalnc8a0nf1q6fjs4f41nwr2mi5z65hl5gqc1r6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-arm64.tar.gz"; - sha256 = "04vsl43f00p0cdhjwlh816asyxlfn32x28q0vwnv0zm60nphwj34"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-darwin-arm64.tar.gz"; + sha256 = "00v34mcnida3nbjv64mqdavqy8qcm467kyzl8sj6afmaz4f5x1xg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-darwin-arm64.tar.gz"; - sha256 = "1260v26z9fyqc8jxxmxq14ph1c9jplv47gmnm7naw59giiqpd6fa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.7-darwin-arm64.tar.gz"; + sha256 = "0rblryyw9yby42p6h4y1xkymy114crk1753zd3cc7jdn6yih938b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.0-darwin-arm64.tar.gz"; - sha256 = "1r96i6lx17j5b3s01lg6bqzr8p7p51bwlk9hcqzxjssh9g3ck9v7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.1-darwin-arm64.tar.gz"; + sha256 = "1rqcal6qnmic987hv8dag55ngixxmyrkrg9zf8fwlv21v5jybj8s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.1-darwin-arm64.tar.gz"; - sha256 = "103cc7zz0x6vik0787yiw8d1vplwqh8z7yznqz2fvi2r7azb6ca6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-darwin-arm64.tar.gz"; + sha256 = "1lxjcd2xgn1b9qx410wa0z9v72zy6bl5pwg3ppb60y65lg551kad"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-darwin-arm64.tar.gz"; - sha256 = "002igkcsrwqxwhjsvkddmvdyhgc60ng3f9yf9s2q7lccjd4kd3sw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-darwin-arm64.tar.gz"; + sha256 = "0cpg87gs14p55lb7575jspsb5vym0mdskhw998vmh9sdxbj94aci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-darwin-arm64.tar.gz"; - sha256 = "1iidb02qq295xhwy48ya07xxdhhfb28ddppxvl88xxk03mfc03f4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-darwin-arm64.tar.gz"; + sha256 = "0z83d07daabjcizsj83zapc74ifi177n1fm98qw95mid9njficm1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.0-darwin-arm64.tar.gz"; - sha256 = "1bq57vszj6r1pdlrgrgnjf34yyqx6d94jdv2hcnwpbq89ijdpij5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-darwin-arm64.tar.gz"; + sha256 = "0wghgnwc355aww0jqlps96axc7zc9823rg2d5pmqj6azk2ablzqr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.5-darwin-arm64.tar.gz"; - sha256 = "0h1pgsrsv6v6w4xdifmfcv5x1n7d9bxh0rj6m5jqprvhy2i41y6q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-darwin-arm64.tar.gz"; + sha256 = "14m8m0vn208p67g72gjib2dpjvsnkhw00986yq7h77bz8aqap93b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.2-darwin-arm64.tar.gz"; - sha256 = "1rffq70948s2p6y7n754j2v9d5r5yzl4asaw4xkrx7jz75vhqm7q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-darwin-arm64.tar.gz"; + sha256 = "0saaclj0a6dx84zdkyk03qmw6rgqmvfvs0q1dj4a9h5vcdgg44x6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-darwin-arm64.tar.gz"; - sha256 = "1b4i7n7hm43jlc4fi7706bxcmijfgfc2bk0d1y941li7sb87g4am"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-darwin-arm64.tar.gz"; + sha256 = "019kvnzazk7aw5fcxf1219pgdn4kb0rp5xs42zi80bfvvc16ilin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-arm64.tar.gz"; - sha256 = "15djjgjf117hswmg8pg53xp8ck8wp2lls6vnfj6ppdx5c6mpj0gh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-darwin-arm64.tar.gz"; + sha256 = "1s7j9l9a9s9f14qm1i1ldiyzc583w8vz3kfsma90qr9rx1xrgsgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.3-darwin-arm64.tar.gz"; - sha256 = "0q8p43jbvv4779mf7zyj8xs4yn6d4lb81d1yg4nllr2zphm4bn5m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-darwin-arm64.tar.gz"; + sha256 = "0v77jnip6d0vgbcf6qm23415kb8www6faj7bigdwhckk4i69lc4b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.4-darwin-arm64.tar.gz"; - sha256 = "0ln3qg14c2yf22a92ab8wwja916gj21qbkkxdzcfgcwc5rh7jkjv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-darwin-arm64.tar.gz"; + sha256 = "1rr98abkhmn8fg4zj8mdrfgkbwr45vkfkkz7xsjgmqy6awvjamh7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-darwin-arm64.tar.gz"; - sha256 = "0wr64m509ayhbh7877zj3i3dmry4bf1625cfzq7f35qip3yczarx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-darwin-arm64.tar.gz"; + sha256 = "1mszvsavgwvbim1av7dbczv66aiahbzk2b771ghp43vdmmghs72m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix index c54ce8bfe1..0e6e1daa66 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , xorg , xkeyboard_config , zlib @@ -33,6 +34,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o="; }; + patches = [ + (fetchpatch { + name = "vncauth-security-type.patch"; + url = "https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582.diff"; + hash = "sha256-lSkR8e+jsBwkQUJZmA0tb8nM5iSbYtO8uVXtgk5wdF8="; + }) + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= diff --git a/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix b/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix deleted file mode 100644 index a1558248f8..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3Packages -, x11vnc -, xrandr -, libGL -, qt5 -}: - -python3Packages.buildPythonApplication rec { - pname = "virtscreen"; - version = "0.3.1"; - - disabled = python3Packages.pythonOlder "3.6"; - - # No tests - doCheck = false; - - src = fetchFromGitHub { - owner = "kbumsik"; - repo = pname; - rev = version; - sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; - }; - - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - propagatedBuildInputs = with python3Packages; [ - netifaces - pyqt5 - quamash - x11vnc - xrandr - ]; - - dontWrapQtApps = true; - - makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" - # import Qt.labs.platform failed without this - "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" - ]; - - postPatch = '' - substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ - ''; - - meta = with lib; { - description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; - homepage = "https://github.com/kbumsik/VirtScreen"; - license = licenses.gpl3; - maintainers = with maintainers; [ borisbabic ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix index 8d7421eff9..a041635746 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -25,13 +25,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${finalAttrs.version}" ; - hash = "sha256-obAXqqQEs7lkv6v1vl3aN+Vh6wPSYSXXbI6mlee6/QM="; + hash = "sha256-EDFUVjud79ZRCzGbOh9L9NcXfN3ikvsqkVSOME9F9oo="; }; # The upstream download script tries to download the models to the @@ -67,7 +67,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart}/lib/stubs "; in lib.optionalString cudaSupport '' substituteInPlace Makefile \ - --replace '${cudaOldStr}' '${cudaNewStr}' + --replace-fail '${cudaOldStr}' '${cudaNewStr}' ''; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { @@ -75,18 +75,21 @@ effectiveStdenv.mkDerivation (finalAttrs: { WHISPER_COREML_ALLOW_FALLBACK = "1"; WHISPER_METAL_EMBED_LIBRARY = "1"; } // lib.optionalAttrs cudaSupport { - WHISPER_CUBLAS = "1"; + GGML_CUDA = "1"; }; - makeFlags = [ "main" "stream" "command" ]; - installPhase = '' runHook preInstall mkdir -p $out/bin + cp ./main $out/bin/whisper-cpp - cp ./stream $out/bin/whisper-cpp-stream - cp ./command $out/bin/whisper-cpp-command + + for file in *; do + if [[ -x "$file" && -f "$file" && "$file" != "main" ]]; then + cp "$file" "$out/bin/whisper-cpp-$file" + fi + done cp models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix index 4807e50adb..3ed21f60d1 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-zWa872YkPh8B7dE//leth+ixIa1wHSRcjkvH2lXzolc="; + hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48="; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix b/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix index 1f3ec386cb..78fa48fde4 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.53.1"; + version = "2.54.0"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-gCjPwDV7jlUwWUhuXHKqL/kigsu3V0ikxhcB3EIBvU0="; + sha256 = "sha256-EYpzVrEM0GrCJcGnFT4XfN6pULqsSMyH02b0zGInH7U="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix deleted file mode 100644 index 48e78fe7d1..0000000000 --- a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: - -stdenv.mkDerivation rec { - pname = "archivemount"; - version = "0.9.1"; - - src = fetchurl { - url = "https://www.cybernoia.de/software/archivemount/archivemount-${version}.tar.gz"; - sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse libarchive ]; - - meta = { - description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - mainProgram = "archivemount"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch index bdf78dcc3c..1791f8a22b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch @@ -24,7 +24,7 @@ index 9cc7f0d..6a52893 100644 LABEL="bcache_backing_found" RUN{builtin}+="kmod load bcache" -RUN+="bcache-register $tempnode" -+RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" ++RUN+="@shell@ -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" LABEL="bcache_backing_end" # Cached devices: symlink diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix index d73d179054..84ecc7ebd9 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash, substituteAll }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { ''; patches = [ - ./bcache-udev-modern.patch + (substituteAll { + src = ./bcache-udev-modern.patch; + shell = "${bash}/bin/sh"; + }) ./fix-static.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index 89261aeac3..3a3899cd42 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -28,18 +28,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-pxLf/YLd7vdAjGRQDvJvwhJXpMUiI3dge5Y5x895SPA="; + hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-btSj69yBbnbK+jdWdMi3rQGKMOLWcwY5Zn3hmEWk/Hs="; + hash = "sha256-Qv2qknWNx2OQeucUFwL1veu3MSF+fd19jFfHCCVGprM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix index d01e6aab14..7024e166c9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix @@ -4,8 +4,8 @@ , halibut }: let - date = "20211129"; - rev = "8cd63c5"; + date = "20241013"; + rev = "3622eda"; in stdenv.mkDerivation { pname = "agedu"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; - hash = "sha256-5wqpL7wrFwIf6lxVte+GXLsXYY0/36EIAUepVNDCnSE="; + hash = "sha256-ZU2bVVo//mAVtVtrKPQ20wZHip/AZPmlL2uaCBcc7rw="; }; nativeBuildInputs = [ cmake halibut ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix index 9f3edad29a..b5328e7fab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix @@ -4,6 +4,7 @@ , makeWrapper , jdk , libsecret +, glib , webkitgtk_4_0 , wrapGAppsHook3 , _7zz @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib webkitgtk_4_0 ])} \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix b/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix index a15d4d08aa..6388be5095 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "askalono"; - version = "0.4.6"; + version = "0.5.0"; src = fetchCrate { pname = "askalono-cli"; inherit version; - hash = "sha256-7l5bHSsmuMoHbbOI3TAYFeHwD3Y62JvfrrXZa08V3+U="; + hash = "sha256-LwyUaU4m9fk+mG8FBfkbj9nBvd8KokwlV7cE7EBwk0Q="; }; - cargoHash = "sha256-OkN8V37GApJvremRJlWG3HSpWgMC17Ge8JMTiQVoc/g="; + cargoHash = "sha256-7yFdoXK9Nyg1uT0mtiXs6evOu1U1quxL7iMMMyxqxqk="; meta = with lib; { description = "Tool to detect open source licenses from texts"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index 17c28c8f3b..c162829b6e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.0"; + version = "1.44.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-0YZma3+Qk2P8lvVS7+Uma0YayuHxtK8lFTZXjTmPIuY="; + hash = "sha256-Qyc4R5hvSal82/qywriH7agluu6miAC4Y7UUM3VATCo="; }; - cargoHash = "sha256-QsUHJpSdI0Vz8hbK0Nqn3gxEpCkMGcj1R1CCgLIyEtE="; + cargoHash = "sha256-fsmwjr7EpzR/KKrGWoTeCOI7jmrlTYtjIksc205kRs8="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix index 9b0369e8fa..2f62d77510 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix @@ -1,27 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libffi -, pkg-config -, wayland-protocols -, wayland-scanner -, wayland -, xorg -, darwin -, nix-update-script -, alsa-lib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libffi, + pkg-config, + wayland-protocols, + wayland-scanner, + wayland, + xorg, + darwin, + nix-update-script, + alsa-lib, + openssl, }: stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.9.0.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-iILtyURYCshicgAV3MWkgMQsXHe7Unj1A08W7tUMU2o="; + hash = "sha256-1vGM9OUE7b4XVTm4Gf20CO80hjYAooeVt0REkY3xu3U="; }; postPatch = '' @@ -34,15 +36,18 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - libffi - wayland-protocols - wayland - xorg.libX11 - alsa-lib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libffi + wayland-protocols + wayland + xorg.libX11 + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; cmakeBuildType = "MinSizeRel"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/default.nix b/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/default.nix index 419b58bfa7..25c250b83f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/default.nix @@ -1,21 +1,24 @@ { lib , buildDotnetModule , fetchFromGitHub +, dotnetCorePackages }: buildDotnetModule rec { pname = "depotdownloader"; - version = "2.5.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "SteamRE"; repo = "DepotDownloader"; rev = "DepotDownloader_${version}"; - sha256 = "Kgi0u+H5BIAhrjk9e+8H1h0p5Edm3+2twYBPY3JQGps="; + sha256 = "c8hgeFTgOjRTjaOSrUazko74GdTW5p9i7+YJIqR28hw="; }; projectFile = "DepotDownloader.sln"; nugetDeps = ./deps.nix; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; passthru.updateScript = ./update.sh; diff --git a/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/deps.nix b/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/deps.nix index 58e2f63ba0..0970c8ba37 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/depotdownloader/deps.nix @@ -2,14 +2,18 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) - (fetchNuGet { pname = "QRCoder"; version = "1.4.3"; sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Microsoft.Windows.CsWin32"; version = "0.3.106"; hash = "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg="; }) + (fetchNuGet { pname = "Microsoft.Windows.SDK.Win32Docs"; version = "0.1.42-alpha"; hash = "sha256-6DvzmNzrGVfWmNJNqooj+Ya+7bAQlyeg7pmyKaUlIws="; }) + (fetchNuGet { pname = "Microsoft.Windows.SDK.Win32Metadata"; version = "60.0.34-preview"; hash = "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM="; }) + (fetchNuGet { pname = "Microsoft.Windows.WDK.Win32Metadata"; version = "0.11.4-experimental"; hash = "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0="; }) + (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) + (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) + (fetchNuGet { pname = "QRCoder"; version = "1.6.0"; hash = "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix index ac6696bbb7..e3b06b2f76 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix @@ -1,37 +1,23 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , nodejs , nix-update-script }: -buildGoModule rec { +buildGo123Module rec { pname = "jfrog-cli"; - version = "2.56.1"; + version = "2.70.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oUICnpVHRNCauWEplz7xH6AdP6CbbYX/Uy/QUPjwGHc="; + hash = "sha256-ddwGmXb616kDNNNTNUykiEWX/2ihUpgetZ/va943RiQ="; }; - vendorHash = "sha256-zQjOOUlqL0Mj2DKHiG9rOfu41SKMO7C99JBJDycXAs4="; - - # Upgrade the Go version during the vendoring FOD build because it fails otherwise. - overrideModAttrs = _: { - preBuild = '' - substituteInPlace go.mod --replace-fail 'go 1.20' 'go 1.21' - ''; - postInstall = '' - cp go.mod "$out/go.mod" - ''; - }; - - # Copy the modified go.mod we got from the vendoring process. - preBuild = '' - cp vendor/go.mod go.mod - ''; + proxyVendor = true; + vendorHash = "sha256-1xUCQF2UDHAmzibixv9pR6G2gvXxIStCyBuz608UpIQ="; postPatch = '' # Patch out broken test cleanup. diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix index abde0b0d79..d3b5ad2e4a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -2,7 +2,9 @@ , stdenv , fetchurl , ncurses +, pkg-config , zig +, zstd , installShellFiles , testers , pie ? stdenv.hostPlatform.isDarwin @@ -10,20 +12,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncdu"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz"; - hash = "sha256-f0neJQJKurGvH/IrO4VCwNFY4Bj+DpYHT9lLDh5tMaU="; + hash = "sha256-P0cevTi1bmDauAwn468dgmZmlX8C2ehBmxSdqvet5QU="; }; nativeBuildInputs = [ zig.hook installShellFiles + pkg-config ]; buildInputs = [ ncurses + zstd ]; zigBuildFlags = lib.optional pie "-Dpie=true"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix index 4901663d0d..0b645519a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix @@ -18,7 +18,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.7.1"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; rev = "refs/tags/v${version}"; - hash = "sha256-+9NNXM4i6saxktF1pl93dmkrqjsErqMB6kEK3IPQTNQ="; + hash = "sha256-qMNnzAxJOS7mabHmGYZ/VkDrpaZbqTJyETSCxq/OrGQ="; }; patches = [ @@ -165,6 +165,7 @@ buildPythonApplication rec { "test_installed_from_venv" "test_uninstall_restores_legacy_hooks" "test_dotnet_" + "test_health_check_" # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`, # but we use an absolute path so it's not an issue. diff --git a/third_party/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix index 80d9b6adf5..75ff19f1bc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.0.32"; + version = "2.1.5"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-GF7cKIf72EYRBRb6d3IWONE7YJwohTLKF1RGdDMTG6c="; + hash = "sha256-moU6XxBVSAZiiR/usFfxse2CHk6+003Jb9t62szk1fk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix index 8c2e3a9b79..b70476166f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -39,6 +39,10 @@ ./patches/0002-reintroduce-tlp-sleep-service.patch ]; + postPatch = '' + substituteInPlace Makefile --replace-fail ' ?= /usr/' ' ?= /' + ''; + buildInputs = [ perl ]; nativeBuildInputs = [ makeWrapper ]; @@ -55,16 +59,6 @@ "TLP_WITH_SYSTEMD=1" "DESTDIR=${placeholder "out"}" - "TLP_BATD=/share/tlp/bat.d" - "TLP_BIN=/bin" - "TLP_CONFDEF=/share/tlp/defaults.conf" - "TLP_CONFREN=/share/tlp/rename.conf" - "TLP_FLIB=/share/tlp/func.d" - "TLP_MAN=/share/man" - "TLP_META=/share/metainfo" - "TLP_SBIN=/sbin" - "TLP_SHCPL=/share/bash-completion/completions" - "TLP_TLIB=/share/tlp" ]; installTargets = [ "install-tlp" "install-man" ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index e00aecd50a..bf01bc9885 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -149,10 +149,7 @@ stdenv.mkDerivation (finalAttrs: { # For the 'urandom', maybe it should be a cross-system option ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" - ++ lib.optionals stdenv.hostPlatform.isWindows [ - "--disable-shared" - "--enable-static" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. "--without-ca-bundle" diff --git a/third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix index 3d696e9520..848c75355d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.7.0"; + version = "6.7.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-8NiJgvZ6Z1QGHX3LeNtipQDbntppE1WO2HbinlgKiNE="; + hash = "sha256-kfQo86Kii9kL1K5L2vTjw9fo65f4H0ikwUGFaSL/Ck8="; }; - vendorHash = "sha256-XAAJ3XuT0OqUAhkkRRftbxYsiPg7OfRnpnWtoUytJ2o="; + vendorHash = "sha256-IkwTi6szNf1Hh50z2jDZsJ2nncvJjnanCsQlrFELpc0="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 4427d2b88a..f68a4e5e74 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - hash = "sha256-sVJvy2WFMlMEg4D4kU4ikw5tyikYVMdfw/GPptS83Iw="; + hash = "sha256-ZanHYU7UEPsI/KAygxcTszUB4emnrrqxiuuLsCVk+cM="; }; vendorHash = "sha256-ySONxi45Ckq0y4BNyTcm8s6KcnXW+k6thqL7qh6mbBc="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix index 0ecd2a0033..29b0c787f4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.15.1"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; - rev = "v${version}"; - hash = "sha256-L1tvP2lZsFD2swhP1MetQFxxxA+EbrI4aDYTJwbpkVI="; + rev = "lychee-v${version}"; + hash = "sha256-H8iNgyLnzgfUPEVPlDosb6l99efrzM+/RIQ7X7nh4Ks="; }; - cargoHash = "sha256-SQ9Dgtg3TKAaj9XkpEzA13U8CumGOlpwiW+Lv6leQW4="; + cargoHash = "sha256-cvEAy0Tx892dsd4zeh5D0fy4hoNBaZ2Q++IStbMbUhY="; nativeBuildInputs = [ pkg-config ]; @@ -41,6 +41,9 @@ rustPlatform.buildRustPackage rec { "--skip=client::tests" "--skip=collector::tests" "--skip=src/lib.rs" + # Color error for those tests as we are not in a tty + "--skip=formatters::response::color::tests::test_format_response_with_error_status" + "--skip=formatters::response::color::tests::test_format_response_with_ok_status" ]; passthru.tests = { @@ -55,7 +58,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Fast, async, stream-based link checker written in Rust"; homepage = "https://github.com/lycheeverse/lychee"; - downloadPage = "https://github.com/lycheeverse/lychee/releases/tag/v${version}"; + downloadPage = "https://github.com/lycheeverse/lychee/releases/tag/lychee-v${version}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ totoroot tuxinaut ]; mainProgram = "lychee"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix index 31214a2295..07a1e906da 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-YtKGiF45fNoiYQFTE3NReUaosRGDJOyjfqtc+tBKopI="; + hash = "sha256-8PIReuWnD7iMesSWAo6E4J+mWNAa7lHKwBWsCsXUG+E="; }; - vendorHash = "sha256-t6kqEmL2lKKYlqxaQ1OsAvB3BSmmyfogghGoE9jw+AI="; + vendorHash = "sha256-KScynPcMZ90XZy/N5X3aQfKuVl/JOCJmd8luNxChkZk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix index c0e0a9d348..f3051ba451 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-LUIKVMI8ljPzAmrq3jYQ+ZDCGs2p+7EO8ECp1A1osUk="; + sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw="; }; - vendorHash = "sha256-1zjXy6x/IzBY7MrtAtynmoneEpjAnYv/H5IsMZtRQAo="; + vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ="; doCheck = false; # Tests require a network connection. diff --git a/third_party/nixpkgs/pkgs/tools/networking/smokeping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/smokeping/default.nix index 29996a1c72..bfae54dc35 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/smokeping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/smokeping/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://oss.oetiker.ch/smokeping"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.erictapen ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/spiped/default.nix b/third_party/nixpkgs/pkgs/tools/networking/spiped/default.nix index 233da21ec9..021549e4f1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/spiped/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/spiped/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, openssl, coreutils }: +{ + lib, + stdenv, + fetchurl, + openssl, + coreutils, + nixosTests, +}: stdenv.mkDerivation rec { pname = "spiped"; version = "1.6.2"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; - sha256 = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; + url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; + hash = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; }; buildInputs = [ openssl ]; @@ -19,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace libcperciva/POSIX/posix-l.sh \ --replace "rm" "${coreutils}/bin/rm" \ --replace "2>/dev/null" "2>stderr.log" - ''; + ''; installPhase = '' runHook preInstall @@ -28,11 +35,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.spiped = nixosTests.spiped; + meta = { description = "Utility for secure encrypted channels between sockets"; - homepage = "https://www.tarsnap.com/spiped.html"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; + homepage = "https://www.tarsnap.com/spiped.html"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 47c9f6dc1b..a9179fd454 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.19.1"; + version = "2.20.1"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-gOoIvPvCc4wcTNhfsOGqYsvM2eibtDcvp986Dkx099A="; + hash = "sha256-ubMlCN7dGCKxBCFNzfnpaDzKCYUNwWwj/84gq/tbw9o="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-3FJ7doC+KIkSY3DZ7ObtlOtDZy0MsPp+Oh9zX1xmhKI="; + vendorHash = "sha256-pz0a0w4SBPJVLWlZi6tsWysiJmwSzroF61nsFxg3R4g="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock b/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock index 99ce44dae7..15b2927104 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock @@ -39,17 +39,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -60,7 +49,7 @@ dependencies = [ "getrandom", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -218,14 +207,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", - "core-graphics", - "image", "log", "objc2", "objc2-app-kit", "objc2-foundation", "parking_lot 0.12.3", - "windows-sys 0.48.0", "x11rb", ] @@ -307,7 +293,7 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel 2.3.1", "async-executor", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "blocking", "futures-lite 2.3.0", @@ -336,9 +322,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", @@ -346,11 +332,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", + "polling 3.7.3", "rustix 0.38.34", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -392,11 +378,11 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", @@ -405,7 +391,7 @@ dependencies = [ "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -470,7 +456,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -500,7 +486,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -659,12 +645,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -711,9 +691,6 @@ name = "bitflags" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] [[package]] name = "blake2" @@ -745,7 +722,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -819,24 +796,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -[[package]] -name = "bytemuck" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" - [[package]] name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - [[package]] name = "bytes" version = "1.7.1" @@ -863,9 +828,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189" +dependencies = [ + "shlex", +] [[package]] name = "cesu8" @@ -894,12 +862,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -992,9 +954,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" dependencies = [ "clap_builder", "clap_derive", @@ -1002,9 +964,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -1022,7 +984,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1095,15 +1057,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" dependencies = [ "async-trait", - "json5", "lazy_static", "nom", "pathdiff", - "ron 0.7.1", - "rust-ini 0.18.0", "serde", - "serde_json", - "toml 0.5.11", "yaml-rust", ] @@ -1113,17 +1070,10 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ - "async-trait", - "convert_case", - "json5", "lazy_static", "nom", "pathdiff", - "ron 0.8.1", - "rust-ini 0.19.0", "serde", - "serde_json", - "toml 0.8.19", "yaml-rust", ] @@ -1194,41 +1144,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - [[package]] name = "constant_time_eq" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "core-foundation" version = "0.9.4" @@ -1241,39 +1162,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[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", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -1329,7 +1226,6 @@ checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ "bitflags 2.6.0", "crossterm_winapi", - "futures-core", "libc", "mio 0.8.11", "parking_lot 0.12.3", @@ -1338,6 +1234,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "futures-core", + "mio 1.0.2", + "parking_lot 0.12.3", + "rustix 0.38.34", + "signal-hook", + "signal-hook-mio", + "winapi", +] + [[package]] name = "crossterm_winapi" version = "0.9.1" @@ -1347,12 +1260,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-common" version = "0.1.6" @@ -1381,17 +1288,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] @@ -1399,11 +1306,11 @@ name = "cursive" version = "0.20.0" source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb" dependencies = [ - "ahash 0.8.11", + "ahash", "async-std", "cfg-if 1.0.0", "crossbeam-channel", - "crossterm", + "crossterm 0.27.0", "cursive_core", "lazy_static", "libc", @@ -1440,7 +1347,7 @@ name = "cursive_core" version = "0.3.7" source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb" dependencies = [ - "ahash 0.8.11", + "ahash", "ansi-parser", "async-std", "crossbeam-channel", @@ -1494,7 +1401,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1550,7 +1457,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1572,7 +1479,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1665,21 +1572,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dlv-list" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - [[package]] name = "dyn-clone" version = "1.0.17" @@ -1739,7 +1631,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1759,7 +1651,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1802,7 +1694,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1927,15 +1819,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - [[package]] name = "ffi-support" version = "0.4.4" @@ -1954,14 +1837,14 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -1972,9 +1855,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -2022,33 +1905,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[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", -] - -[[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]] -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" @@ -2152,7 +2008,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2271,19 +2127,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "grpcio" version = "0.12.1" @@ -2327,7 +2170,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.3.0", + "indexmap 2.4.0", "slab", "tokio", "tokio-util", @@ -2354,9 +2197,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -2364,7 +2204,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.11", + "ahash", ] [[package]] @@ -2373,7 +2213,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", ] @@ -2392,7 +2232,7 @@ version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64 0.21.7", + "base64", "byteorder", "flate2", "nom", @@ -2533,17 +2373,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "hostname" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "windows 0.52.0", -] - [[package]] name = "http" version = "0.2.12" @@ -2690,19 +2519,6 @@ dependencies = [ "libc", ] -[[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 = "indent" version = "0.1.1" @@ -2727,9 +2543,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2834,17 +2650,11 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2855,17 +2665,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - [[package]] name = "keyring-manager" version = "0.5.1" @@ -2997,6 +2796,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -3012,9 +2812,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -3131,6 +2931,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3144,7 +2954,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -3161,12 +2970,13 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", + "log", "wasi", "windows-sys 0.52.0", ] @@ -3365,18 +3175,6 @@ dependencies = [ "libc", ] -[[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 1.0.0", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -3385,7 +3183,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", ] @@ -3839,26 +3637,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list 0.3.0", - "hashbrown 0.12.3", -] - -[[package]] -name = "ordered-multimap" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" -dependencies = [ - "dlv-list 0.5.2", - "hashbrown 0.13.2", -] - [[package]] name = "oslog" version = "0.2.0" @@ -3994,51 +3772,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pest" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "pest_meta" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" -dependencies = [ - "once_cell", - "pest", - "sha2 0.10.8", -] - [[package]] name = "petgraph" version = "0.6.5" @@ -4046,7 +3779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.3.0", + "indexmap 2.4.0", ] [[package]] @@ -4076,7 +3809,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4093,9 +3826,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -4118,19 +3851,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - [[package]] name = "polling" version = "2.8.0" @@ -4149,9 +3869,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -4159,7 +3879,7 @@ dependencies = [ "pin-project-lite", "rustix 0.38.34", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4196,11 +3916,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy 0.6.6", + "zerocopy", ] [[package]] @@ -4210,7 +3930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4278,7 +3998,7 @@ dependencies = [ "prost 0.12.6", "prost-types", "regex", - "syn 2.0.72", + "syn 2.0.74", "tempfile", ] @@ -4305,7 +4025,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4424,15 +4144,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" @@ -4455,9 +4166,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4503,7 +4214,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ - "hostname 0.3.1", + "hostname", "quick-error", ] @@ -4522,29 +4233,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ron" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "serde", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.6.0", - "serde", - "serde_derive", -] - [[package]] name = "rpassword" version = "7.3.1" @@ -4599,26 +4287,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if 1.0.0", - "ordered-multimap 0.4.3", -] - -[[package]] -name = "rust-ini" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" -dependencies = [ - "cfg-if 1.0.0", - "ordered-multimap 0.6.0", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -4685,7 +4353,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.7", + "base64", ] [[package]] @@ -4706,11 +4374,11 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustyline-async" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6eb06391513b2184f0a5405c11a4a0a5302e8be442f4c5c35267187c2b37d5" +checksum = "bc9396d834c31f9fddd716e7c279e7cb70207092a1e59767918610f5c560c6eb" dependencies = [ - "crossterm", + "crossterm 0.28.1", "futures-channel", "futures-util", "pin-project", @@ -4736,10 +4404,20 @@ dependencies = [ ] [[package]] -name = "scc" -version = "2.1.6" +name = "sanitize-filename" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ccfb12511cdb770157ace92d7dda771e498445b78f9886e8cdbc5140a4eced" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "scc" +version = "2.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79da19444d9da7a9a82b80ecf059eceba6d3129d84a8610fd25ff2364f255466" dependencies = [ "sdd", ] @@ -4765,7 +4443,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.29.1", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4792,9 +4470,9 @@ dependencies = [ [[package]] name = "sdd" -version = "2.1.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177258b64c0faaa9ffd3c65cd3262c2bc7e2588dbbd9c1641d0346145c1bbda8" +checksum = "0495e4577c672de8254beb68d01a9b62d0e8a13c099edecdbedccce3223cd29f" [[package]] name = "secret-service" @@ -4862,9 +4540,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" dependencies = [ "serde_derive", ] @@ -4921,13 +4599,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4938,7 +4616,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4949,14 +4627,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "itoa", "memchr", @@ -4972,7 +4650,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4990,7 +4668,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "itoa", "ryu", "serde", @@ -5033,7 +4711,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5044,7 +4722,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5133,6 +4811,7 @@ checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", "mio 0.8.11", + "mio 1.0.2", "signal-hook", ] @@ -5154,12 +4833,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - [[package]] name = "simplelog" version = "0.12.2" @@ -5296,9 +4969,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -5328,14 +5001,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if 1.0.0", "fastrand 2.1.0", + "once_cell", "rustix 0.38.34", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5393,7 +5067,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5416,17 +5090,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" version = "0.3.36" @@ -5460,15 +5123,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.8.0" @@ -5493,7 +5147,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio 1.0.2", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", @@ -5521,7 +5175,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5585,7 +5239,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "toml_datetime", "winnow 0.5.40", ] @@ -5596,7 +5250,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -5611,7 +5265,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.7", + "base64", "bytes", "futures-core", "futures-util", @@ -5640,7 +5294,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64", "bytes", "h2", "http 0.2.12", @@ -5680,15 +5334,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5722,7 +5376,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5870,6 +5524,7 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", + "time", "tracing", "tracing-core", "tracing-log 0.2.0", @@ -5908,7 +5563,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" dependencies = [ - "gloo-utils 0.1.7", + "gloo-utils", "serde", "serde-wasm-bindgen 0.5.0", "serde_json", @@ -5925,7 +5580,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5971,12 +5626,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -6102,15 +5751,15 @@ dependencies = [ [[package]] name = "veilid-cli" -version = "0.3.4" +version = "0.4.0" dependencies = [ "arboard", "async-std", "async-tungstenite 0.23.0", "cfg-if 1.0.0", "chrono", - "clap 4.5.13", - "config 0.14.0", + "clap 4.5.15", + "config 0.13.4", "console", "crossbeam-channel", "cursive", @@ -6127,7 +5776,7 @@ dependencies = [ "log", "lru", "owning_ref", - "parking_lot 0.12.3", + "parking_lot 0.11.2", "rustyline-async", "serde", "serde_derive", @@ -6143,7 +5792,7 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.3.4" +version = "0.4.0" dependencies = [ "argon2", "async-io 1.13.0", @@ -6199,6 +5848,7 @@ dependencies = [ "range-set-blaze", "rustls", "rustls-pemfile", + "sanitize-filename", "schemars", "send_wrapper 0.6.0", "serde", @@ -6246,7 +5896,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.3.4" +version = "0.4.0" dependencies = [ "allo-isolate", "android_log-sys 0.3.1", @@ -6257,7 +5907,7 @@ dependencies = [ "data-encoding", "ffi-support", "futures-util", - "hostname 0.3.1", + "hostname", "jni", "lazy_static", "libc-print", @@ -6281,9 +5931,9 @@ dependencies = [ [[package]] name = "veilid-hashlink" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3dabbda02cfe176635dcaa18a021416ff2eb4d0b47a913e3fdc7f62049d7b1" +checksum = "2070d1d09dad90091d23e49743408f82f8874994dec5ae0a8d3689b061bba426" dependencies = [ "hashbrown 0.14.5", "serde", @@ -6304,14 +5954,15 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.3.4" +version = "0.4.0" dependencies = [ "ansi_term", "async-std", "async-tungstenite 0.27.0", "backtrace", "cfg-if 1.0.0", - "clap 4.5.13", + "chrono", + "clap 4.5.15", "color-eyre", "config 0.14.0", "console-subscriber", @@ -6320,7 +5971,7 @@ dependencies = [ "directories", "flume", "futures-util", - "hostname 0.4.0", + "hostname", "json", "lazy_static", "nix 0.29.0", @@ -6338,6 +5989,7 @@ dependencies = [ "signal-hook-async-std", "stop-token", "sysinfo", + "time", "tokio", "tokio-stream", "tokio-util", @@ -6357,7 +6009,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.3.4" +version = "0.4.0" dependencies = [ "android_logger 0.13.3", "async-lock 3.4.0", @@ -6415,17 +6067,17 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.3.4" +version = "0.4.0" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", "data-encoding", "futures-util", - "gloo-utils 0.2.0", + "gloo-utils", "js-sys", "lazy_static", "parking_lot 0.12.3", - "send_wrapper 0.6.0", + "send_wrapper 0.4.0", "serde", "serde-wasm-bindgen 0.6.5", "serde_bytes", @@ -6480,11 +6132,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "serde", "serde_json", "wasm-bindgen-macro", @@ -6492,24 +6145,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -6519,9 +6172,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6529,31 +6182,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-bindgen-test" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -6562,13 +6216,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -6590,9 +6244,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6645,12 +6299,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - [[package]] name = "wg" version = "0.9.1" @@ -6700,11 +6348,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6799,6 +6447,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -7061,9 +6718,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "xmltree" @@ -7118,34 +6775,14 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "zerocopy" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" -dependencies = [ - "byteorder", - "zerocopy-derive 0.6.6", -] - [[package]] name = "zerocopy" version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy-derive" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", + "byteorder", + "zerocopy-derive", ] [[package]] @@ -7156,7 +6793,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7176,7 +6813,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix b/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix index e06a03b8ed..9f74fd4291 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - hash = "sha256-nEJxiox2aoQBV83vlpiBB4In59+lfHF6/a8HqDYcFT4="; + hash = "sha256-5Xjdc66VA7FFk75jnTARCs2oGT/hWX8VPlZV48q6kpI="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/lix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/lix/default.nix index 6cead94f56..4a100c337f 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/lix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/lix/default.nix @@ -63,26 +63,9 @@ lib.makeExtensible (self: { lix_2_91 = ( common { - version = "2.91.0"; - hash = "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s="; - docCargoHash = "sha256-KOn1fXF7k7c/0e5ZCNZwt3YZmjL1oi5A2mhwxQWKaUo="; - - patches = [ - # Fix meson to not use target_machine, fixing cross. This commit is in release-2.91: remove when updating to 2.91.1 (if any). - # https://gerrit.lix.systems/c/lix/+/1781 - # https://git.lix.systems/lix-project/lix/commit/ca2b514e20de12b75088b06b8e0e316482516401 - (fetchpatch { - url = "https://git.lix.systems/lix-project/lix/commit/ca2b514e20de12b75088b06b8e0e316482516401.patch"; - hash = "sha256-TZauU4RIsn07xv9vZ33amrDvCLMbrtcHs1ozOTLgu98="; - }) - # Fix musl builds. This commit is in release-2.91: remove when updating to 2.91.1 (if any). - # https://gerrit.lix.systems/c/lix/+/1823 - # https://git.lix.systems/lix-project/lix/commit/ed51a172c69996fc6f3b7dfaa86015bff50c8ba8 - (fetchpatch { - url = "https://git.lix.systems/lix-project/lix/commit/ed51a172c69996fc6f3b7dfaa86015bff50c8ba8.patch"; - hash = "sha256-X59N+tOQ2GN17p9sXvo9OiuEexzB23ieuOvtq2sre5c="; - }) - ]; + version = "2.91.1"; + hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U="; + docCargoHash = "sha256-F6Ld0HfRvW9r5zn8eMTP6djnV/jvwjYQet4Ghp2T90k="; } ); diff --git a/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix index a8be3c4323..1767775540 100644 --- a/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "apkleaks"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "dwisiswant0"; repo = "apkleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-a7zOowvhV9H91RwNDImN2+ecixY8g3WUotlBQVdmLgA="; + hash = "sha256-8P4LZsyq0mSVdE6QhnW3QaaA3UAg4UDBS3jSg7Kg/oY="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix index c9f85d0327..8909dab339 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-skgRkj6LrzRN5diQVbGU0KeJBklGWM6dksbr2njMDk0="; + hash = "sha256-GdFU8mx9H3daxziprIOQWZWEBcz9y9Qk88sus838Xlk="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix index 62fccb926e..a13b265a64 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.26.0"; + version = "11.27.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-dbcTQuaUiVDcPKkYt10CJYHEleNqji1yEE8jEBBJtpg="; + hash = "sha256-6B+OiIX/9NkbroOhM4zNbWoKDbequS1sBk6QNlVEG1I="; }; proxyVendor = true; - vendorHash = "sha256-lG+PssQh/Cyp6Qgibm/OcJqnVecKERJNVLzKscIFnGo="; + vendorHash = "sha256-RjJ/UN0EvKTzR7XazRLStIht6wR0X7XIUDghMzRqEX4="; subPackages = [ "apps/cnspec" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 3a961dc978..dafad76dd8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -6,20 +6,21 @@ gitleaks, installShellFiles, testers, + nix-update-script, }: buildGoModule rec { pname = "gitleaks"; - version = "8.20.1"; + version = "8.21.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-oIhA1+gicNXDHzpdVzFeDvJHGCrqBhwyV+KOyYwMaK8="; + hash = "sha256-oBX9V7OQ+t1hBLsYvX3u5BY8VSj2YGNJ/6qdJH6BVhg="; }; - vendorHash = "sha256-4bGpTMmQmsJQ2RNIehYe0xAwwGOh2l6FGsKdciEVLAc="; + vendorHash = "sha256-BxuqNe021wfvFHpTRQtDImallBg2PcIX5qM7aLB+uH0="; ldflags = [ "-s" @@ -44,6 +45,8 @@ buildGoModule rec { command = "${pname} version"; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Scan git repos (or files) for secrets"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix b/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix index 6cbe088d68..32797408a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-stGjxv9cgYxxclQpyytN6dhFm2G1Gxbf9MdyKw6gEC4="; + hash = "sha256-bZ8cNREPUgIO7lJg0WBtc9qvkDUnfqtFNi612Ctcxo8="; }; vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4="; diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index e42dcb6ec4..b558409f0c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-YN79sO/XNU9/HqzN/MWfrcsIyAIcWJGdSIfn00o3alY="; + hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk="; }; - vendorHash = "sha256-8QC6CiaI69U/pE3JcSi3key6IscvZkWcdbmNvikbP1w="; + vendorHash = "sha256-zTPJtuKPtsVsgMwHFjVwAh1/3DudW7TPWOMJ20nNu1I="; subPackages = [ "cmd/httpx" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix index f61944fe63..149cd32221 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -51,5 +51,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kylesferrazza totoroot ]; + # Very similar issue to hdfview, see: https://github.com/NixOS/nixpkgs/issues/340048 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/noseyparker/default.nix b/third_party/nixpkgs/pkgs/tools/security/noseyparker/default.nix index b39666071f..8e71720b61 100644 --- a/third_party/nixpkgs/pkgs/tools/security/noseyparker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/noseyparker/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "noseyparker"; - version = "0.18.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "noseyparker"; rev = "v${version}"; - hash = "sha256-IorJWXhS1ZUye1wKPnGb+zx/YgfXhwi3cb/V3zpYaKY="; + hash = "sha256-pFAtyvnqCLTY3l7c47rpN1jHjQon0fTPT3KaV9mcs3Q="; }; - cargoHash = "sha256-xf70RKPZY96oUuifBC0mg5lV0MjGpzR2qDQbNJMSYtM="; + cargoHash = "sha256-t4tZDww6aySlTBq1BB4OGhi9w6fGY2gi7mPM1SR2mt8="; nativeCheckInputs = [ git @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec { "--skip=github::github_repos_list_user_human_format" "--skip=github::github_repos_list_user_json_format" "--skip=github::github_repos_list_user_jsonl_format" + "--skip=github::github_repos_list_user_repo_filter" "--skip=scan::appmaker::scan_workflow_from_git_url" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 1afba85be3..4a0d7254a3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.17"; + version = "2.36.18"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-2bt/AUcXwXf1TxPesfXSyoiBeLHx+LGgDk4xbXEAcaY="; + sha256 = "sha256-sj+6EnpPPsl/MWMxan6dXIqJO8NePcwnVFrTCcM1SbQ="; }; - vendorHash = "sha256-gtl8T8wXnpLgDZc6qSgFKpA+XbcLNHf20ieBkyNdE+s="; + vendorHash = "sha256-mi2Jqiy1T1fcuasrIXPkhu8VTmq78WFOK/d3i7CXkhw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix index ec12b6f4bd..ffe76b156f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix @@ -1,31 +1,37 @@ -{ lib -, fetchFromGitHub -, installShellFiles -, nixosTests -, python3Packages +{ + lib, + fetchFromGitHub, + installShellFiles, + nixosTests, + python3Packages, }: python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "3.2.0"; - format = "setuptools"; - outputs = [ "out" "man" ]; + version = "3.3.0"; + pyproject = true; + + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "jtesta"; - repo = pname; + repo = "ssh-audit"; rev = "refs/tags/v${version}"; - sha256 = "sha256-g5h0A1BJqzOZaSVUxyi7IsCcrbto4+7+HpiVjFZy50Y="; + hash = "sha256-sjYKQpn37zH3xpuIiZAjCn0DyLqqoQDwuz7PKDfkeTM="; }; + build-system = with python3Packages; [ setuptools ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' installManPage $src/ssh-audit.1 ''; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; passthru.tests = { inherit (nixosTests) ssh-audit; @@ -33,11 +39,14 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Tool for ssh server auditing"; - mainProgram = "ssh-audit"; homepage = "https://github.com/jtesta/ssh-audit"; changelog = "https://github.com/jtesta/ssh-audit/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ tv SuperSandro2000 ]; + maintainers = with maintainers; [ + tv + SuperSandro2000 + ]; + mainProgram = "ssh-audit"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix index ba35b7c110..9f2af377e3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-MxGhG8ehXT7ftXfoVHMSpyIr25tWj5Yq50nZZW/q5sQ="; + hash = "sha256-PaOe24rXu6e8jhjwpuQquPQidQDSxI1WOAMYJSLjbSI="; }; - vendorHash = "sha256-5TWofXHtiBhfsSg3UgSju+7EO+t9bUktsd/WUAH5R5U="; + vendorHash = "sha256-N8Wy4DHxP6yQOfWDmyVPSi9eHj8G01SSIxQmqKujRgo="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix index 2a392b33a6..e88777eb10 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "tlsx"; rev = "refs/tags/v${version}"; - hash = "sha256-vCB1sUT5auZmIg3lHFdV905wDfay5R8v+5lEKIuVzEQ="; + hash = "sha256-AQiwHNHfwOJYIEsFm2YiksdTUxp5vkCL80rpvxHY2rA="; }; - vendorHash = "sha256-Tgvs5BUuRTGSU05O+8SSvHvReACqIXqt9MEJWB7O8p4="; + vendorHash = "sha256-KNyB+xK7TUf7XoVX/4xBTnG2lMMPVV5AOoUNi4aA/cM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix index 6ffb4d4825..1487b5caa8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.5"; + version = "0.37.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-ezF8cV3JPE/GObpTc4wPw/YcQrOKNi2bsRs3svLWpV8="; + sha256 = "sha256-iRXBT3VpEVHna3GkMxVSVRqQ2HTK7gCd6LkthwrBMx4="; }; - vendorHash = "sha256-jwxKFgUhBilX/HxwjtHwLzmyUFrM8snM6Sq1CdY7oOY="; + vendorHash = "sha256-1iyJ56YKu/WVb7dPP7YE07kdbJte2/Sww8cQu+epFNc="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 757972de94..7bfc0c29a4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -9,16 +9,16 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; rev = version; - hash = "sha256-bjLa3/B+H49BHXU9xYAtoSsaJBtDJIm6+coGEplzxdM="; + hash = "sha256-69uTSZJrqDqaOVm504XbegqyBFIQCVMPBk4lybFZctE="; }; - cargoHash = "sha256-3JfdgGHhj2Fva9BB5vNYDX1eHk2EZl/7f6AeLRqkaGQ="; + cargoHash = "sha256-lw/FmMiDE2fSVZgpjSvZXLC5635C8uNLSv0tczSOB4g="; # used for "Server Installed" version in admin panel env.VW_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/tools/security/xcrawl3r/default.nix b/third_party/nixpkgs/pkgs/tools/security/xcrawl3r/default.nix index c12439f49d..fd3a33eaac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/xcrawl3r/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/xcrawl3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xcrawl3r"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xcrawl3r"; rev = "refs/tags/${version}"; - hash = "sha256-K7UuWsteI8mEAGOF/g/EbT/Ch6sbmKhiiYB3npdDmFk="; + hash = "sha256-W1cvSvRnDGFp4br8s/nL+owIGWTJ1bVX6kvmeTLUuuI="; }; - vendorHash = "sha256-/yBSrZdlVMZgcKcONBSq7C5IFC30TJL0z6FZRXm+HUs="; + vendorHash = "sha256-fHdtqjFmT+8cmy2SxjjBvw5Rct7lA2ksGVmm/9ncbRI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/zlint/default.nix b/third_party/nixpkgs/pkgs/tools/security/zlint/default.nix index c23cfa528d..f2b370d65b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/zlint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/zlint/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zlint"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "zmap"; repo = "zlint"; rev = "refs/tags/v${version}"; - hash = "sha256-N199sSxe06nm0CInTYAuwRgoq7hN7IQpHz5ERUSpk3M="; + hash = "sha256-FFgBRuNvm4Cnjls9y+L256vMGGNu10x7Vh+V9HBon70="; }; modRoot = "v3"; diff --git a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix index ec7396ca3e..9838eb7c8b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.34.0"; + version = "5.34.2"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-N/UUzYlzu84QTLhRf/P8UEBSoINwPu4NDoc9smuRmCA="; + sha256 = "sha256-KRyj2JjptCW20MF2hyj+zWwc9MJox52xX9omKFrVuDI="; }; nativeBuildInputs = [ bison flex ] ++ diff --git a/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix b/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix index deefe70569..fb9783a998 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-pzUjcezzZ3Fo9b7nuPV08ZSxrk7cBufQL6Dbfvmjkg4="; + hash = "sha256-iobC5qhrQg/vy161atU0NqqKnvsr1CGaiXAe6Ln+Tn8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-tZTrjIax3zofrRuSJQO7VA7rlTXN/GT1KTcsLpvB+2Q="; + vendorHash = "sha256-CirTiIQD3Xvt+ly7Ll3THLwImqbyQDDIz092ihosejY="; nativeBuildInputs = [ installShellFiles ]; @@ -46,7 +46,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.9.0.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.10.0.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix b/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix index e97e03180d..b887c6e97a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix @@ -14,7 +14,6 @@ , jq , removeReferencesTo , nixosTests -, file , writers }: @@ -24,7 +23,7 @@ let opensslSrc = fetchurl info.openssl; - toolchain = import ./toolchain-bin.nix { inherit stdenv lib fetchzip file; }; + toolchain = import ./toolchain-bin.nix { inherit stdenv lib fetchzip autoPatchelfHook; }; in diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/toolchain-bin.nix b/third_party/nixpkgs/pkgs/tools/system/osquery/toolchain-bin.nix index dd1ff9264d..d2fed973fe 100644 --- a/third_party/nixpkgs/pkgs/tools/system/osquery/toolchain-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/toolchain-bin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, file }: +{ stdenv, lib, fetchzip, autoPatchelfHook }: let version = "1.1.0"; @@ -24,24 +24,13 @@ stdenv.mkDerivation { src = fetchzip dist.${stdenv.hostPlatform.system}; - nativeBuildInputs = [ file ]; + nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' mkdir $out cp -r * $out ''; - # autoPatchelfHook cannot be used here because of https://github.com/NixOS/nixpkgs/issues/333710 - postFixup = '' - read -r interpreter < "$NIX_BINTOOLS"/nix-support/dynamic-linker - for file in $(find "$out"/usr/bin -type f -executable); do - if [[ $(file "$file") == *ELF*dynamically* ]]; then - patchelf --interpreter "$interpreter" "$file" - patchelf --set-rpath "$out/usr/lib" "$file" - fi - done - ''; - meta = with lib; { description = "A LLVM-based toolchain for Linux designed to build a portable osquery"; homepage = "https://github.com/osquery/osquery-toolchain"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index e640d32c55..6dbe584d8e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "10.0.1"; + version = "11.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-i1luJsAADk7VqrZAqnI52XGrbWeNLBMnzW0wxEO5LXQ="; + sha256 = "sha256-Pwt8HhbO+1wmEGYRny1W5HzKRWmvTneqN4fuAaKcYaA="; }; - vendorHash = "sha256-g8KN8M1jB4lTjXNfTw6gnjTCN4HDBTqtNS6c+5tJQv4="; + vendorHash = "sha256-uokBuQquSkdbHsI3hZ7/FxE93/QOZ6jD2zB8vDPeESI="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/nltk-data/default.nix b/third_party/nixpkgs/pkgs/tools/text/nltk-data/default.nix index a8179541c5..56ec586cc3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/nltk-data/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/nltk-data/default.nix @@ -63,4 +63,9 @@ lib.makeScope newScope (self: { location = "corpora"; hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk="; }; + wordnet = makeNltkDataPackage { + pname = "wordnet"; + location = "corpora"; + hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk="; + }; }) diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix index cceda4e155..4cf05bd98a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - hash = "sha256-sYfMMKBqaYf3dfFcxE9awUMW+Hk7ps0/zpVFHul7GWM="; + hash = "sha256-UI/f5EC5OOvwrxP1wfnNgEpY1DCwmekQohTILRvM2Gc="; }; - vendorHash = "sha256-xm5qKSg7OU++mVtTeRwefL3J1Uf+a0nFdtlD7eulI8s="; + vendorHash = "sha256-p52IIzkAkcnqbxXBqQ92crYBrD84wQb/uVsTWX8EsPE="; subPackages = [ "cmd/shfmt" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 7449be94e1..d5b529b755 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook -, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , enableDarwinSandbox ? true @@ -9,49 +8,15 @@ stdenv.mkDerivation rec { pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}"; - version = "1.1.0"; + version = "1.1.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug=="; + hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA=="; }; - patches = [ - # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be - # UTF-8 continuation bytes, as control characters. - # - # This leaves control characters U+0080 through U+009F in the output - # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net - # win. - # - # See: https://github.com/kristapsdz/lowdown/pull/140 - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff"; - hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ="; - }) - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff"; - hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08="; - }) - - # Don't output a newline after .SH - # - # This fixes `makewhatis` output on macOS and (as a result) `man` - # completions for `fish` on macOS. - # - # See: https://github.com/kristapsdz/lowdown/pull/138 - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff"; - hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU="; - }) - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff"; - hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E="; - }) - ]; - nativeBuildInputs = [ which dieHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -70,6 +35,13 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Fix rpath change on darwin to avoid failure like: + # error: install_name_tool: changing install names or + # rpaths can't be redone for: liblowdown.1.dylib (for architecture + # arm64) because larger + # https://github.com/NixOS/nixpkgs/pull/344532#issuecomment-238475791 + env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; + makeFlags = [ "bins" # prevents shared object from being built unnecessarily ]; @@ -109,8 +81,10 @@ stdenv.mkDerivation rec { installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' runHook preInstallCheck + echo '# TEST' > test.md $out/bin/lowdown test.md + runHook postInstallCheck ''; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix index fab60f9832..fddaa22a2d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix @@ -25,15 +25,16 @@ , pkg-config , qemu , xz +, gitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guestfs-tools"; - version = "1.52.0"; + version = "1.52.2"; src = fetchurl { - url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor version}-stable/guestfs-tools-${version}.tar.gz"; - sha256 = "sha256-Iv0TIpcEX5CmdAbw/w7uDyoBBqXxyNz8XDlqYl/3g3Y="; + url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor finalAttrs.version}-stable/guestfs-tools-${finalAttrs.version}.tar.gz"; + hash = "sha256-02khDS2NLG1QOSqswtDoqBX2Mg6sE/OiUoP9JFs4vTU="; }; nativeBuildInputs = [ @@ -55,9 +56,7 @@ stdenv.mkDerivation rec { ]) ++ (with ocamlPackages; [ findlib - gettext-stub ocaml - ocaml_gettext ounit2 ]); @@ -107,11 +106,18 @@ stdenv.mkDerivation rec { --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]} ''; - meta = with lib; { - description = "Extra tools for accessing and modifying virtual machine disk images"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - homepage = "https://libguestfs.org/"; - maintainers = [ ]; - platforms = platforms.linux; + passthru.updateScript = gitUpdater { + url = "https://github.com/libguestfs/guestfs-tools"; + rev-prefix = "v"; + odd-unstable = true; }; -} + + meta = { + description = "Extra tools for accessing and modifying virtual machine disk images"; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + homepage = "https://libguestfs.org/"; + changelog = "https://www.libguestfs.org/guestfs-tools-release-notes-${lib.versions.majorMinor finalAttrs.version}.1.html"; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 87cec31134..339c3095d4 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -88,60 +88,35 @@ mapAliases { adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09 - advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 # Post 24.11 branch-off, this should throw an error addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25 - aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" - airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 - alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 - alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 - alsaLib = alsa-lib; # Added 2021-06-09 - alsaOss = alsa-oss; # Added 2021-06-10 - alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 - alsaPlugins = alsa-plugins; # Added 2021-06-10 - alsaTools = alsa-tools; # Added 2021-06-10 - alsaUtils = alsa-utils; # Added 2021-06-10 - amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 - angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 - ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 - ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 + alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 + alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 + alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17 + alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17 + alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17 + alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 + angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 ao = libfive; # Added 2024-10-11 - apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 - apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 - antimicroX = antimicrox; # Added 2021-10-31 + antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 - arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 - archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 - ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 - asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 - asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 - asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 - atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 - avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17 avrlibcCross = avrlibc; # Added 2024-09-06 awesome-4-0 = awesome; # Added 2022-05-05 aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11 @@ -151,55 +126,31 @@ mapAliases { badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; - ballAndPaddle = throw "'ballAndPaddle' has been removed because it was broken and abandoned upstream"; # Added 2023-10-16 - bashInteractive_5 = bashInteractive; # Added 2021-08-20 - bash_5 = bash; # Added 2021-08-20 - bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 - bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 + bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 + bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 - bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 - bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 - bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 - beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 - binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 bitwarden = bitwarden-desktop; # Added 2024-02-25 - bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 - bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 - bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 bmap-tools = bmaptool; # Added 2024-08-05 - bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 - boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost16x = throw "boost16x has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost170 = throw "boost170 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 - boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 - bpftool = bpftools; # Added 2021-05-03 - bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 + bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 - bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 - bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; @@ -219,17 +170,11 @@ mapAliases { calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; - cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 - cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; - cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 - cargo-graph = throw "cargo-graph has been removed as it is broken and archived upstream"; # Added 2024-03-16 - catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; - ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 certmgr-selfsigned = certmgr; # Added 2023-11-30 challenger = taler-challenger; # Added 2024-09-04 check_smartmon = throw "'check_smartmon' has been renamed to 'nagiosPlugins.check_smartmon'"; # Added 2024-05-03 @@ -243,68 +188,43 @@ mapAliases { check-uptime = throw "'check-uptime' has been renamed to 'nagiosPlugins.check_uptime'"; # Added 2024-05-03 check-wmiplus = throw "'check-wmiplus' has been renamed to 'nagiosPlugins.check_wmi_plus'"; # Added 2024-05-03 checkSSLCert = throw "'checkSSLCert' has been renamed to 'nagiosPlugins.check_ssl_cert'"; # Added 2024-05-03 - chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 - chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 - chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 - chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chiaki4deck = chiaki-ng; # Added 2024-08-04 - chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 ChowPhaser = chow-phaser; # Added 2024-06-12 ChowKick = chow-kick; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 - chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 - citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 - citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 - clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 - clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 - composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 - cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 - clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 + clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 - claws-mail-gtk3 = claws-mail; # Added 2021-07-10 - clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 - cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 + claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 cockroachdb-bin = cockroachdb; # 2024-03-15 - codimd = hedgedoc; # Added 2020-11-29 + codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 - compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 - concurrencykit = libck; # Added 2021-03 - connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 + concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 - convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 - crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 - cvs_fast_export = cvs-fast-export; # Added 2021-06-10 + cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 # these are for convenience, not for backward compat and shouldn't expire - clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 - clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 - clang8Stdenv = throw "clang8Stdenv has been removed from nixpkgs"; # Added 2024-01-24 clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 - clang10Stdenv = throw "clang10Stdenv has been removed from nixpkgs"; # Added 2024-01-26 - clang11Stdenv = throw "clang11Stdenv has been removed from nixpkgs"; # Added 2023-01-24 clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; clang14Stdenv = lowPrio llvmPackages_14.stdenv; @@ -314,18 +234,8 @@ mapAliases { clang18Stdenv = lowPrio llvmPackages_18.stdenv; clang19Stdenv = lowPrio llvmPackages_19.stdenv; - clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 - clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 - clang-tools_8 = throw "clang-tools_8 has been removed from nixpkgs"; # Added 2024-01-24 clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08 - clang-tools_10 = throw "clang-tools_10 has been removed from nixpkgs"; # Added 2023-01-26 - clang-tools_11 = throw "clang-tools_11 has been removed from nixpkgs"; # Added 2023-01-24 - clang_6 = throw "clang_6 has been removed from nixpkgs"; # Added 2024-01-08 - clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 - clang_8 = throw "clang_8 has been removed from nixpkgs"; # Added 2024-01-24 clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08 - clang_10 = throw "clang_10 has been removed from nixpkgs"; # Added 2024-01-26 - clang_11 = throw "clang_11 has been removed from nixpkgs"; # Added 2023-01-24 clang-tools_12 = llvmPackages_12.clang-tools; # Added 2024-04-22 clang-tools_13 = llvmPackages_13.clang-tools; # Added 2024-04-22 @@ -340,115 +250,65 @@ mapAliases { ### D ### - dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 - dart_stable = dart; # Added 2020-01-15 + dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 - deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; - debugedit-unstable = debugedit; # Added 2021-11-22 - deltachat-electron = deltachat-desktop; # added 2021-07-18 + debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 + deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 - dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 - devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 - dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 - dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 - dnnl = oneDNN; # Added 2020-04-22 + dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 - docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 - docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 - docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 - docker-proxy = throw "`docker-proxy` has been merged to the main repo of Moby since Docker 22.06"; # Added 2024-03-14 - dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 - dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 - dolphinEmu = dolphin-emu; # Added 2021-11-10 - dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 - dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 + dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17 + dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17 dotty = scala_3; # Added 2023-08-20 - dotnet-netcore = dotnet-runtime; # Added 2021-10-07 - dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; # Added 2020-01-19 - dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; # Added 2020-01-19 - dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; # Added 2020-09-11 - drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 + dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17 + dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 + dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 + dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 - dylibbundler = macdylibbundler; # Added 2021-04-24 + dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 ### E ### EBTKS = ebtks; # Added 2024-01-21 eask = eask-cli; # Added 2024-09-05 - ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 - ec2_api_tools = ec2-api-tools; # Added 2021-10-08 + ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17 + ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 elasticsearch7Plugins = elasticsearchPlugins; # Electron - electron_9 = throw "electron_9 has been removed in favor of newer versions"; # added 2023-09-11 - electron_10 = throw "electron_10 has been removed in favor of newer versions"; # added 2024-03-20 - electron_10-bin = throw "electron_10-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_11 = throw "electron_11 has been removed in favor of newer versions"; # added 2024-03-20 - electron_11-bin = throw "electron_11-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_12 = throw "electron_12 has been removed in favor of newer versions"; # added 2024-03-20 - electron_12-bin = throw "electron_12-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_13 = throw "electron_13 has been removed in favor of newer versions"; # added 2024-03-20 - electron_13-bin = throw "electron_13-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_14 = throw "electron_14 has been removed in favor of newer versions"; # added 2024-03-20 - electron_14-bin = throw "electron_14-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_15 = throw "electron_15 has been removed in favor of newer versions"; # added 2024-03-20 - electron_15-bin = throw "electron_15-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_16 = throw "electron_16 has been removed in favor of newer versions"; # added 2024-03-20 - electron_16-bin = throw "electron_16-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_17 = throw "electron_17 has been removed in favor of newer versions"; # added 2024-03-20 - electron_17-bin = throw "electron_17-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_18 = throw "electron_18 has been removed in favor of newer versions"; # added 2024-03-20 - electron_18-bin = throw "electron_18-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_19 = throw "electron_19 has been removed in favor of newer versions"; # added 2024-03-20 - electron_19-bin = throw "electron_19-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_20 = throw "electron_20 has been removed in favor of newer versions"; # added 2024-03-20 - electron_20-bin = throw "electron_20-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_21 = throw "electron_21 has been removed in favor of newer versions"; # added 2024-03-20 - electron_21-bin = throw "electron_21-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_22 = throw "electron_22 has been removed in favor of newer versions"; # added 2024-03-20 - electron_22-bin = throw "electron_22-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_23 = throw "electron_23 has been removed in favor of newer versions"; # added 2024-03-20 - electron_23-bin = throw "electron_23-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_26 = throw "electron_26 has been removed in favor of newer versions"; # added 2024-03-20 - electron_26-bin = throw "electron_26-bin has been removed in favor of newer versions"; # added 2024-03-20 - elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24 elixir_ls = elixir-ls; # Added 2023-03-20 # Emacs emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28NativeComp = emacs28; # Added 2022-06-08 - emacs28Packages = emacs28.pkgs; # Added 2021-10-04 - emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17 + emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 - emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 - emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 - emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 - empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 - enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 enyo-doom = enyo-launcher; # Added 2022-09-09 - epoxy = libepoxy; # Added 2021-11-11 + epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24 @@ -464,12 +324,7 @@ mapAliases { erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24 erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24 - etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 - etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 - eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16 - exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07 - exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20 eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; ### F ### @@ -477,9 +332,8 @@ mapAliases { fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 - fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 - fastnlo = fastnlo-toolkit; # Added 2021-04-24 + fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19 inherit (luaPackages) fennel; # Added 2022-09-24 @@ -490,7 +344,6 @@ mapAliases { ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 - findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; @@ -498,37 +351,24 @@ mapAliases { firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 - fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 - flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 - flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 - flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 - foldingathome = fahclient; # Added 2020-09-03 + foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 - foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20 fractal-next = fractal; # added 2023-11-25 framework-system-tools = framework-tool; # added 2023-12-09 francis = kdePackages.francis; # added 2024-07-13 - fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 - fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 - fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 - fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01 fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01 @@ -539,12 +379,8 @@ mapAliases { ### G ### g4music = gapless; # Added 2024-07-26 - g4py = python3Packages.geant4; # Added 2020-06-06 + g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 - garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 - garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 - garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 - garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 @@ -553,10 +389,7 @@ mapAliases { gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 - gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 - geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 - geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 @@ -571,11 +404,8 @@ mapAliases { Consider migrating to forgejo or gitea. ''; # Added 2024-10-12 - go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 - gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 - git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; @@ -587,15 +417,12 @@ mapAliases { topGit = top-git; }; # Added 2021-01-14 - gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 - glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 - gmailieer = lieer; # Added 2020-04-19 - gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 + gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; @@ -619,147 +446,67 @@ mapAliases { gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 - gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 - gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 - gnuradio-with-packages = gnuradio3_7.override { - extraPackages = lib.attrVals [ - "osmosdr" - "ais" - "gsm" - "nacl" - "rds" - "limesdr" - ] - gnuradio3_7Packages; - }; # Added 2020-10-16 + gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 - gmock = gtest; # moved from top-level 2021-03-14 - - gnome3 = gnome; # Added 2021-05-07 - gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 + gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 - gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 - gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 - gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 - gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 - gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 - gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 - go2nix = throw "'go2nix' has been removed as it was archived upstream"; # Added 2023-12-27 - gobby5 = gobby; # Added 2021-02-01 + gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 #godot - godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 - godot-export-templates = throw "godot-export-templates has been renamed to godot3-export-templates to distinguish from version 4"; # Added 2023-07-16 - godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 - godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 - gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 - google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 - google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 - google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 go-upower-notify = upower-notify; # Added 2024-07-21 - gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 - govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 - gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; - gpt4all-chat = throw "gpt4all-chat has been renamed to gpt4all"; # Added 2024-02-27 gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; - graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 - gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 - gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana_reporter = grafana-reporter; # Added 2024-06-09 - gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 - graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 - gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 - gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 - gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 - gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 - gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 - grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 - gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 - guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 ### H ### - haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 - haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 HentaiAtHome = hentai-at-home; # Added 2024-06-12 - hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 - hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 - hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - hipcc = throw "'hipcc' has been replaced with 'rocmPackages.hipcc'"; # Added 2023-10-08 - hipchat = throw "'hipchat' has been discontinued since 2019; upstream recommends Slack."; # Added 2023-12-02 - hipify = throw "'hipify' has been replaced with 'rocmPackages.hipify'"; # Added 2023-10-08 - hipcub = throw "'hipcub' has been replaced with 'rocmPackages.hipcub'"; # Added 2023-10-08 - hipsparse = throw "'hipsparse' has been replaced with 'rocmPackages.hipsparse'"; # Added 2023-10-08 - hipfort = throw "'hipfort' has been replaced with 'rocmPackages.hipfort'"; # Added 2023-10-08 - hipfft = throw "'hipfft' has been replaced with 'rocmPackages.hipfft'"; # Added 2023-10-08 - hipsolver = throw "'hipsolver' has been replaced with 'rocmPackages.hipsolver'"; # Added 2023-10-08 - hipblas = throw "'hipblas' has been replaced with 'rocmPackages.hipblas'"; # Added 2023-10-08 - hip-amd = throw "'hip-amd' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 - hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 - ht-rust = xh; # Added 2021-02-13 + ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; - hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 - hyper-haskell-server-with-packages = throw "'hyper-haskell-server-with-packages' has been removed. reason: has been broken for a long time"; # Added 2024-03-14 ### I ### i3-gaps = i3; # Added 2023-01-03 ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15 ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15 - icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 - imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 - imagemagick7Big = imagemagickBig; # Added 2021-02-22 - imagemagick7 = imagemagick; # Added 2021-02-22 - imagemagick7_light = imagemagick_light; # Added 2021-02-22 - imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 + imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 + imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 + imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 - indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 - indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 - instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26 - insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13 index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 - infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 inotifyTools = inotify-tools; - inter-ui = inter; # Added 2021-03-27 - iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 + inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 ipfs-migrator = kubo-migrator; # Added 2022-09-27 - iproute = iproute2; # moved from top-level 2021-03-14 + iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2024-10-17 irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12 isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 @@ -768,59 +515,47 @@ mapAliases { ### J ### - jack2Full = jack2; # moved from top-level 2021-03-14 + jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17 jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 - jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 - jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 - jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 - join-desktop = throw "'join-desktop' has been removed because it is unmaintained upstream"; # Added 2023-10-04 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08 - julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 - julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28 ### K ### - k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 - k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 - kafkacat = kcat; # Added 2021-10-07 + kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17 kak-lsp = kakoune-lsp; # Added 2024-04-01 kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 - kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 - keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 - keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 + kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 keepkey_agent = keepkey-agent; # added 2024-01-06 - kerberos = krb5; # moved from top-level 2021-03-14 - kexectools = kexec-tools; # Added 2021-09-03 + kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17 + kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17 keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 - keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 - kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21 + keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 kgx = gnome-console; # Added 2022-02-19 kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 kibana = kibana7; - kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 + kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; - kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17 krb5Full = krb5; - krita-beta = krita; # moved from top-level 2021-12-23 + krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 kubei = kubeclarity; # Added 2023-05-20 - kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 ### L ### @@ -829,10 +564,8 @@ mapAliases { LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; - ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 - llvmPackages_rocm = throw "'llvmPackages_rocm' has been replaced with 'rocmPackages.llvm'"; # Added 2023-10-08 libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01 libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25 libav_0_8 = libav; # Added 2024-08-25 @@ -844,45 +577,36 @@ mapAliases { libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 - libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 - libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 - libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 - libgpgerror = libgpg-error; # Added 2021-09-04 + libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 libheimdal = heimdal; # Added 2022-11-18 - libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; - libjpeg_drop = libjpeg_original; # Added 2020-06-05 - liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 - libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 + libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 + liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 - libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 - librdf = lrdf; # Added 2020-03-22 + librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 LibreArp = librearp; # Added 2024-06-12 LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17 - libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 - libseat = seatd; # Added 2021-06-24 - libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 + libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 - libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 - libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 - libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 - libungif = giflib; # Added 2020-02-12 - libusb = libusb1; # Added 2020-04-28 + libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 + libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17 + libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17 + libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2024-10-17 + libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17 libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26 libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 - libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; linux_wallpaperengine = throw "linux_wallpaperengine was removed due to freeimage dependency"; # Added 2024-07-19 @@ -968,38 +692,17 @@ mapAliases { llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; - lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 - lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 - lld_8 = throw "lld_8 has been removed from nixpkgs"; # Added 2024-01-24 lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08 - lld_10 = throw "lld_10 has been removed from nixpkgs"; # Added 2024-01-26 - lld_11 = throw "lld_11 has been removed from nixpkgs"; # Added 2024-01-24 - lldb_6 = throw "lldb_6 has been removed from nixpkgs"; # Added 2024-01-08 - lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 - lldb_8 = throw "lldb_8 has been removed from nixpkgs"; # Added 2024-01-24 lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08 - lldb_10 = throw "lldb_10 has been removed from nixpkgs"; # Added 2024-01-26 - lldb_11 = throw "lldb_11 has been removed from nixpkgs"; # Added 2024-01-24 - llvmPackages_6 = throw "llvmPackages_6 has been removed from nixpkgs"; # Added 2024-01-09 - llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 - llvmPackages_8 = throw "llvmPackages_8 has been removed from nixpkgs"; # Added 2024-01-24 llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08 - llvmPackages_10 = throw "llvmPackages_10 has been removed from nixpkgs"; # Added 2024-01-26 - llvmPackages_11 = throw "llvmPackages_11 has been removed from nixpkgs"; # Added 2024-01-24 - llvm_6 = throw "llvm_6 has been removed from nixpkgs"; # Added 2024-01-08 - llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 - llvm_8 = throw "llvm_8 has been removed from nixpkgs"; # Added 2024-01-24 llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08 - llvm_10 = throw "llvm_10 has been removed from nixpkgs"; # Added 2024-01-26 - llvm_11 = throw "llvm_11 has been removed from nixpkgs"; # Added 2024-01-24 - lobster-two = google-fonts; # Added 2021-07-22 + lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 - luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 - lzma = xz; # moved from top-level 2021-03-14 + lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 ### M ### @@ -1007,12 +710,8 @@ mapAliases { MACS2 = macs2; # Added 2023-06-12 mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19 mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 - mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 - mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 - markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 - markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 @@ -1021,80 +720,56 @@ mapAliases { mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 - matrique = spectral; # Added 2020-01-27 - matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 - matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 + matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 + matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 - mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 - meme = meme-image-generator; # Added 2021-04-21 - mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 + meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 MIDIVisualizer = midivisualizer; # Added 2024-06-12 - migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 - minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 - miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 - miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 - miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 - miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 minetest-touch = minetestclient; # Added 2024-08-12 minetestclient_5 = minetestclient; # Added 2023-12-11 minetestserver_5 = minetestserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 - mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26 - mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31 - mod_dnssd = apacheHttpdPackages.mod_dnssd; # Added 2014-11-07 - mod_fastcgi = apacheHttpdPackages.mod_fastcgi; # Added 2014-11-07 - mod_python = apacheHttpdPackages.mod_python; # Added 2014-11-07 - mod_wsgi = apacheHttpdPackages.mod_wsgi; # Added 2014-11-07 - mod_ca = apacheHttpdPackages.mod_ca; # Added 2019-12-24 - mod_crl = apacheHttpdPackages.mod_crl; # Added 2019-12-24 - mod_csr = apacheHttpdPackages.mod_csr; # Added 2019-12-24 - mod_ocsp = apacheHttpdPackages.mod_ocsp; # Added 2019-12-24 - mod_scep = apacheHttpdPackages.mod_scep; # Added 2019-12-24 - mod_spkac = apacheHttpdPackages.mod_spkac; # Added 2019-12-24 - mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; # Added 2019-12-24 - mod_timestamp = apacheHttpdPackages.mod_timestamp; # Added 2019-12-24 - monero = monero-cli; # Added 2021-11-28 - moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 - mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 - mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 + mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 + mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 + mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17 + mod_wsgi = throw "'mod_wsgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_wsgi'"; # Converted to throw 2024-10-17 + mod_ca = throw "'mod_ca' has been renamed to/replaced by 'apacheHttpdPackages.mod_ca'"; # Converted to throw 2024-10-17 + mod_crl = throw "'mod_crl' has been renamed to/replaced by 'apacheHttpdPackages.mod_crl'"; # Converted to throw 2024-10-17 + mod_csr = throw "'mod_csr' has been renamed to/replaced by 'apacheHttpdPackages.mod_csr'"; # Converted to throw 2024-10-17 + mod_ocsp = throw "'mod_ocsp' has been renamed to/replaced by 'apacheHttpdPackages.mod_ocsp'"; # Converted to throw 2024-10-17 + mod_scep = throw "'mod_scep' has been renamed to/replaced by 'apacheHttpdPackages.mod_scep'"; # Converted to throw 2024-10-17 + mod_spkac = throw "'mod_spkac' has been renamed to/replaced by 'apacheHttpdPackages.mod_spkac'"; # Converted to throw 2024-10-17 + mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17 + mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17 + monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17 mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11 mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 - moonlander = throw "'moonlander' has been removed due to it being broken and unmaintained"; # Added 2023-11-26 moz-phab = mozphab; # Added 2022-08-09 - mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 - mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 - mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 - mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 - murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; - mysql = mariadb; # moved from top-level 2021-03-14 + mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17 mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' or 'pkgs.mesa.drivers' depending on target use case."; # Converted to throw 2024-07-11 ### N ### ncdu_2 = ncdu; # Added 2022-07-22 neocities-cli = neocities; # Added 2024-07-31 - nestopia = throw "nestopia was forked; use nestopia-ue instead"; # Added 2024-01-24 - net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 - netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 - netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 - netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring @@ -1109,7 +784,6 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 @@ -1120,37 +794,21 @@ mapAliases { "nix-repl has been removed because it's not maintained anymore, " + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 - nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 - nixFlakes = nixVersions.stable; # Added 2021-05-21 + nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 - nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 - nixopsUnstable = nixops_unstable; # Added 2022-03-03 # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. - nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 nixosTest = testers.nixosTest; # Added 2022-05-05 - nmap-unfree = nmap; # Added 2021-04-06 - nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 - nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 - nodejs-14_x = nodejs_14; # Added 2022-11-06 - nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 - nodejs_16 = throw "nodejs_16 has been removed as it is EOL."; # Added 2023-10-30 - nodejs-16_x = nodejs_16; # Added 2022-11-06 - nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 - nodejs-slim_16 = throw "nodejs-slim_16 has been removed as it is EOL."; # Added 2022-11-06 - nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 + nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 - nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 - nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 - noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 NSPlist = nsplist; # Added 2024-01-05 @@ -1167,35 +825,20 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 - oauth2_proxy = oauth2-proxy; # Added 2021-04-18 - obinskit = throw "'obinskit' has been removed from nixpkgs, because the package was unmaintained and depended on an insecure version of electron"; # Added 2024-03-20 - octant = throw "octant has been dropped due to being archived and vulnerable"; # Added 2023-09-29 - octant-desktop = throw "octant-desktop has been dropped due to being archived and vulnerable"; # Added 2023-09-29 - octorpki = throw "octorpki has been removed, upstream says to use rpki-client instead"; # Added 2024-03-19 - ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 - ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 + oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 - opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 - opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 openafs_1_8 = openafs; # Added 2022-08-22 - openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 - openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 - opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 - openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 - openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 - openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 - openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 - openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 - openisns = open-isns; # Added 2020-01-28 + openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjdk19_headless = openjdk19; # Added 2024-08-01 jdk19 = openjdk19; # Added 2024-08-01 @@ -1207,46 +850,34 @@ mapAliases { openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07 openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01 - openjpeg_2 = openjpeg; # Added 2021-01-25 + openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2024-10-17 openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04 openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 - openmpt123 = libopenmpt; # Added 2021-09-05 + openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17 openssl_3_0 = openssl_3; # Added 2022-06-27 - openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 - optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 - orchis = orchis-theme; # Added 2021-06-09 - oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 + orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 - oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 OSCAR = oscar; # Added 2024-06-12 - osxfuse = macfuse-stubs; # Added 2021-03-20 + osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 - oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 - packet-cli = metal-cli; # Added 2021-10-25 + packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 - packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 - palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 - pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 - paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 - paperless = paperless-ngx; # Added 2021-06-06 + paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 paperless-ng = paperless-ngx; # Added 2022-04-11 - parity = throw "parity, renamed to openethereum, has been terminated by upstream"; # Added 2020-08-01 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 - pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 patchelfStable = patchelf; # Added 2024-01-25 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 - pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 @@ -1258,26 +889,14 @@ mapAliases { petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 - phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 - photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 - picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 - picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 - # Obsolete PHP version aliases - php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 - php80Packages = php80; # Added 2023-06-21 - php80Extensions = php80; # Added 2023-06-21 - pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; - pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 - pleroma-otp = pleroma; # Added 2021-07-10 + pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 pltScheme = racket; # just to be sure - pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 - pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 @@ -1309,67 +928,46 @@ mapAliases { tty = pinentry-tty; flavors = [ "curses" "emacs" "gnome3" "gtk2" "qt" "tty" ]; }; # added 2024-01-15 - pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 - pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 - pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10 - pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 - pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 - pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17 pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 - poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 - prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 - privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs = probe-rs-tools; # Added 2024-05-23 - probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23 - processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 - prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 - prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 - protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 - protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 protobuf3_24 = protobuf_24; protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 - proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 - pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 - pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 - pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 python = python2; # Added 2022-01-11 - python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 - python-swiftclient = swiftclient; # Added 2021-09-09 + python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 ### Q ### qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 - qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 - qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 + qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17 qflipper = qFlipper; # Added 2022-02-11 - qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qt515 = qt5; # Added 2022-11-24 - qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 + qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17 qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 - qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 + qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23 quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 @@ -1380,90 +978,47 @@ mapAliases { quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 - qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 - quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 ### R ### rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 - radare2-cutter = cutter; # Added 2021-03-30 + radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 radicle-upstream = throw "'radicle-upstream' was sunset, see "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warn "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 - rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 - rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 - rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 - readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02 replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13 restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 - restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 - retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; - ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 - ring-daemon = jami-daemon; # Added 2021-10-26 - rnix-lsp = throw "'rnix-lsp' has been removed as it is unmaintained"; # Added 2024-03-09 + ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17 rockbox_utility = rockbox-utility; # Added 2022-03-17 - rocalution = throw "'rocalution' has been replaced with 'rocmPackages.rocalution'"; # Added 2023-10-08 - rocblas = throw "'rocblas' has been replaced with 'rocmPackages.rocblas'"; # Added 2023-10-08 - rocfft = throw "'rocfft' has been replaced with 'rocmPackages.rocfft'"; # Added 2023-10-08 - rocprim = throw "'rocprim' has been replaced with 'rocmPackages.rocprim'"; # Added 2023-10-08 - rocrand = throw "'rocrand' has been replaced with 'rocmPackages.rocrand'"; # Added 2023-10-08 - rocsparse = throw "'rocsparse' has been replaced with 'rocmPackages.rocsparse'"; # Added 2023-10-08 - rocthrust = throw "'rocthrust' has been replaced with 'rocmPackages.rocthrust'"; # Added 2023-10-08 - roctracer = throw "'roctracer' has been replaced with 'rocmPackages.roctracer'"; # Added 2023-10-08 - rocwmma = throw "'rocwmma' has been replaced with 'rocmPackages.rocwmma'"; # Added 2023-10-08 - rocclr = throw "'rocclr' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - rocdbgapi = throw "'rocdbgapi' has been replaced with 'rocmPackages.rocdbgapi'"; # Added 2023-10-08 - rocgdb = throw "'rocgdb' has been replaced with 'rocmPackages.rocgdb'"; # Added 2023-10-08 - rocprofiler = throw "'rocprofiler' has been replaced with 'rocmPackages.rocprofiler'"; # Added 2023-10-08 - rocsolver = throw "'rocsolver' has been replaced with 'rocmPackages.rocsolver'"; # Added 2023-10-08 - rocmClangStdenv = throw "'rocmClangStdenv' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 - rocmUpdateScript = throw "'rocmUpdateScript' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 - rocminfo = throw "'rocminfo' has been replaced with 'rocmPackages.rocminfo'"; # Added 2023-10-08 - rocmlir = throw "'rocmlir' has been replaced with 'rocmPackages.rocmlir'"; # Added 2023-10-08 - rocmlir-rock = throw "'rocmlir-rock' has been replaced with 'rocmPackages.rocmlir-rock'"; # Added 2023-10-08 - rocm-cmake = throw "'rocm-cmake' has been replaced with 'rocmPackages.rocm-cmake'"; # Added 2023-10-08 - rocm-comgr = throw "'rocm-comgr' has been replaced with 'rocmPackages.rocm-comgr'"; # Added 2023-10-08 - rocm-core = throw "'rocm-core' has been replaced with 'rocmPackages.rocm-core'"; # Added 2023-10-08 - rocm-device-libs = throw "'rccl' has been replaced with 'rocmPackages.rocm-device-libs'"; # Added 2023-10-08 - rocm-opencl-icd = rocmPackages.clr.icd; # Added 2023-10-08 Convert to throw after 23.11 is released - rocm-opencl-runtime = rocmPackages.clr; # Added 2023-10-08 Convert to throw after 23.11 is released - rocm-runtime = throw "'rocm-runtime' has been replaced with 'rocmPackages.rocm-runtime'"; # Added 2023-10-08 - rocm-smi = throw "'rocm-smi' has been replaced with 'rocmPackages.rocm-smi'"; # Added 2023-10-08 - rocm-thunk = throw "'rocm-thunk' has been replaced with 'rocmPackages.rocm-thunk'"; # Added 2023-10-08 - rocr-debug-agent = throw "'rocr-debug-agent' has been replaced with 'rocmPackages.rocr-debug-agent'"; # Added 2023-10-08 - rome = throw "rome is no longer maintained, consider using biome instead"; # Added 2023-09-12 - rpiboot-unstable = rpiboot; # Added 2021-07-30 + rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 - rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 - rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; rustc-wasm32 = rustc; # Added 2023-12-01 rustic-rs = rustic; # Added 2024-08-02 - rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 - rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 + rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17 + rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17 # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17 rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28 - rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### SDL_classic = SDL1; # Added 2024-09-03 - s2n = s2n-tls; # Added 2021-03-03 + s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 - sane-backends-git = sane-backends; # Added 2021-02-19 + sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17 scantailor = scantailor-advanced; # Added 2022-05-26 schildichat-web = throw '' schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes. @@ -1473,43 +1028,23 @@ mapAliases { schildichat-desktop = schildichat-web; schildichat-desktop-wayland = schildichat-web; scitoken-cpp = scitokens-cpp; # Added 2024-02-12 - scylladb = throw "'scylladb' has been removed due to being unmaintained"; # Added 2024-03-17 - sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 - searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 - semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14 session-desktop-appimage = session-desktop; - setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 - sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 - sgtpuzzles = throw "'sgtpuzzles' has been renamed to 'sgt-puzzles'"; # Added 2023-10-06 - sgtpuzzles-mobile = throw "'sgtpuzzles-mobile' has been renamed to 'sgt-puzzles-mobile'"; # Added 2023-10-06 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 - shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 - signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 - simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 - skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 + shout = nodePackages.shout; # Added unknown; moved 2024-10-19 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 - slack-dark = slack; # Added 2020-03-27 - slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 + slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 slurm-llnl = slurm; # renamed July 2017 - smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; soldat-unstable = opensoldat; # Added 2022-07-02 - solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 - solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 - soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 - spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 - spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 - spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 - spark_3_3 = throw "'spark_3_3' is no longer supported nixpkgs, please use 'spark'"; # Added 2024-03-23 spark2014 = gnatprove; # Added 2024-02-25 # Added 2020-02-10 @@ -1535,21 +1070,14 @@ mapAliases { source-han-serif-traditional-chinese = source-han-serif; - spacegun = throw "'spacegun' has been removed as unmaintained"; # Added 2023-05-20 - spectral = neochat; # Added 2020-12-27 - speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 - spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 + spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell - spidermonkey = spidermonkey_78; # Added 2020-10-09 + spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 - spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 spotify-unwrapped = spotify; # added 2022-11-06 - spring-boot = spring-boot-cli; # added 2020-04-24 - squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 - ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 - starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; @@ -1562,37 +1090,32 @@ mapAliases { steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 - supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07 - swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 swig4 = swig; # Added 2024-09-12 swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12 - swtpm-tpm2 = swtpm; # Added 2021-02-26 + swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17 Sylk = sylk; # Added 2024-06-12 symbiyosys = sby; # Added 2024-08-18 sync = taler-sync; # Added 2024-09-04 - syncthing-cli = syncthing; # Added 2021-04-06 + syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 ### T ### tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 - tangogps = foxtrotgps; # Added 2020-01-26 + tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17 taskwarrior = lib.warn "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 taro = taproot-assets; # Added 2023-07-04 tdesktop = telegram-desktop; # Added 2023-04-07 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 - telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 - teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 - teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26 - teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 + teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18 temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01 @@ -1600,22 +1123,17 @@ mapAliases { temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01 - tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 - thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 - timescale-prometheus = promscale; # Added 2020-09-29 - tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 + timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 - tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 - tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 transmission-gtk = lib.warn (transmission3Warning {suffix = "-gtk";}) transmission_3-gtk; # Added 2024-06-10 @@ -1628,8 +1146,6 @@ mapAliases { trezor_agent = trezor-agent; # Added 2024-01-07 openai-triton-llvm = triton-llvm; # added 2024-07-18 trust-dns = hickory-dns; # Added 2024-08-07 - trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 - trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25 tvbrowser-bin = tvbrowser; # Added 2023-03-02 @@ -1640,16 +1156,13 @@ mapAliases { ### U ### uade123 = uade; # Added 2022-07-30 - uberwriter = apostrophe; # Added 2020-04-23 - ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17 + ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17 ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 uclibc = uclibc-ng; # Added 2022-06-16 uclibcCross = uclibc-ng; # Added 2022-06-16 - ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22 uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 - uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 - uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 - unicorn-emu = unicorn; # Added 2020-10-29 + unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01 @@ -1658,24 +1171,20 @@ mapAliases { unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01 unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 - untrunc = untrunc-anthwlock; # Added 2021-02-01 - urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 - urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 - urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 - urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 - urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 - urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 - urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 - urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 - urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 - usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 - utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 + untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 + urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17 + urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17 + urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17 + urxvt_perl = throw "'urxvt_perl' has been renamed to/replaced by 'rxvt-unicode-plugins.perl'"; # Converted to throw 2024-10-17 + urxvt_perls = throw "'urxvt_perls' has been renamed to/replaced by 'rxvt-unicode-plugins.perls'"; # Converted to throw 2024-10-17 + urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17 + urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17 + urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17 util-linuxCurses = util-linux; # Added 2022-04-12 - utillinux = util-linux; # Added 2020-11-24 + utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475 ### V ### - v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 @@ -1686,30 +1195,18 @@ mapAliases { ventoy-bin-full = ventoy-full; # Added 2023-04-12 verilog = iverilog; # Added 2024-07-12 ViennaRNA = viennarna; # Added 2023-08-23 - vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 - vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 - virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 - virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 - vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 + virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 - vsmtp = throw "'vsmtp' has been removed, upstream gone"; # Added 2023-12-18 - vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 - varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 - volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### wakatime = wakatime-cli; # 2024-05-30 wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 - waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' 'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins' @@ -1717,20 +1214,12 @@ mapAliases { 'wayfireApplications-unwrapped.wlroots' has been removed ''; # Add 2023-07-29 waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 - wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 - webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; wineWayland = wine-wayland; - win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 win-virtio = virtio-win; # Added 2023-10-17 - win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 - wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 - wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28 wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14 wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release - wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 - wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_5 = wordpress_6_5; # Added 2024-08-03 @@ -1740,17 +1229,12 @@ mapAliases { wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 write_stylus = styluslabs-write-bin; # Added 2024-10-09 - wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 - wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 - wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 - wxmac = wxGTK30; # Added 2023-03-22 ### X ### - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 - xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10 - xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10 - xdg_utils = xdg-utils; # Added 2021-02-01 + x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22 + xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 + xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05 xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-10-05 @@ -1758,35 +1242,26 @@ mapAliases { xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05 xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05 xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; - xineLib = xine-lib; # Added 2021-04-27 - xineUI = xine-ui; # Added 2021-04-27 + xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17 + xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17 xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 - xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 - xvfb_run = xvfb-run; # Added 2021-05-07 + xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 ### Y ### - yacc = bison; # moved from top-level 2021-03-14 + yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 - yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 - yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 - yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 ### Z ### - zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 zinc = zincsearch; # Added 2023-05-28 @@ -1797,15 +1272,13 @@ mapAliases { ### UNSORTED ### - zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 - dina-font-pcf = dina-font; # Added 2020-02-09 + dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 - gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 - posix_man_pages = man-pages-posix; # Added 2021-04-15 - ttyrec = ovh-ttyrec; # Added 2021-01-02 - zplugin = zinit; # Added 2021-01-30 + posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 + ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 + zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17 zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6d851595c0..d763bf23ad 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -196,6 +196,8 @@ with pkgs; appimageTools = callPackage ../build-support/appimage { }; + appimageupdate-qt = appimageupdate.override { withQtUI = true; }; + appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; bindle = callPackage ../servers/bindle { @@ -311,6 +313,12 @@ with pkgs; banana-accounting = callPackage ../applications/office/banana-accounting { }; + basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { + tbb = tbb_2021_11; + cereal = cereal_1_3_2; + opencv = opencv.override { enableGtk3 = true; }; + }; + beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; beeper = callPackage ../applications/networking/instant-messengers/beeper { }; @@ -444,6 +452,10 @@ with pkgs; circt = callPackage ../development/compilers/circt { }; + clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { + stdenv = clangStdenv; + }; + classicube = callPackage ../games/classicube { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; @@ -528,8 +540,6 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; - dcgm = callPackage ../os-specific/linux/dcgm { }; deck = callPackage ../by-name/de/deck/package.nix { @@ -1761,9 +1771,7 @@ with pkgs; grizzly = callPackage ../tools/misc/grizzly { }; - guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { - ocamlPackages = ocaml-ng.ocamlPackages_4_14; - }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; fabs = callPackage ../tools/backup/fabs { }; @@ -1910,7 +1918,7 @@ with pkgs; scarab = callPackage ../tools/games/scarab { }; - sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; + inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2; sdlookup = callPackage ../tools/security/sdlookup { }; @@ -2517,7 +2525,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; + fceux-qt5 = fceux.override { ___qtVersion = "5"; }; + fceux-qt6 = fceux.override { ___qtVersion = "6"; }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; @@ -2902,8 +2911,6 @@ with pkgs; yaft = callPackage ../applications/terminal-emulators/yaft { }; - writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { }; lifecycled = callPackage ../tools/misc/lifecycled { }; @@ -3037,8 +3044,6 @@ with pkgs; archivebox = callPackage ../applications/misc/archivebox { }; - archivemount = callPackage ../tools/filesystems/archivemount { }; - archivy = callPackage ../applications/misc/archivy { }; arandr = callPackage ../tools/X11/arandr { }; @@ -4308,8 +4313,6 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash-geoip = callPackage ../data/misc/clash-geoip { }; - clevercsv = with python3Packages; toPythonApplication clevercsv; cli53 = callPackage ../tools/admin/cli53 { }; @@ -5366,8 +5369,6 @@ with pkgs; libnvme = callPackage ../os-specific/linux/libnvme { }; - libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { }; - librenms = callPackage ../servers/monitoring/librenms { }; libxnd = callPackage ../development/libraries/libxnd { }; @@ -5737,7 +5738,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_27; + electron = electron_31; }; portal = callPackage ../tools/misc/portal { }; @@ -8369,7 +8370,7 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; halide = callPackage ../development/compilers/halide { - llvmPackages = llvmPackages_16; + llvmPackages = llvmPackages_18; }; hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); @@ -9251,8 +9252,6 @@ with pkgs; matrix-conduit = callPackage ../servers/matrix-conduit { }; - matrix-sliding-sync = callPackage ../servers/matrix-synapse/sliding-sync { }; - matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { }; matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { }; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; @@ -9741,6 +9740,7 @@ with pkgs; libportal-gtk3 = libportal.override { variant = "gtk3"; }; libportal-gtk4 = libportal.override { variant = "gtk4"; }; libportal-qt5 = libportal.override { variant = "qt5"; }; + libportal-qt6 = libportal.override { variant = "qt6"; }; libmicrodns = callPackage ../development/libraries/libmicrodns { }; @@ -10896,7 +10896,7 @@ with pkgs; oxlint = callPackage ../development/tools/oxlint { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { + ovito = qt6Packages.callPackage ../applications/graphics/ovito { inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; @@ -10961,8 +10961,6 @@ with pkgs; papertrail = callPackage ../tools/text/papertrail { }; - pappl = callPackage ../applications/printing/pappl { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; @@ -11173,7 +11171,9 @@ with pkgs; pingtcp = callPackage ../tools/networking/pingtcp { }; - pingu = callPackage ../tools/networking/pingu { }; + pingu = callPackage ../tools/networking/pingu { + buildGoModule = buildGo122Module; + }; pinnwand = callPackage ../servers/pinnwand { }; @@ -11295,7 +11295,9 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { }; - podman-desktop = callPackage ../applications/virtualization/podman-desktop {}; + podman-desktop = callPackage ../applications/virtualization/podman-desktop { + inherit (darwin) autoSignDarwinBinariesHook; + }; pods = callPackage ../applications/virtualization/pods { }; @@ -12175,8 +12177,6 @@ with pkgs; shotwell = callPackage ../applications/graphics/shotwell { }; - shout = nodePackages.shout; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -12745,7 +12745,8 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }) teleport_14 teleport_15 teleport_16 teleport; + buildGoModule = buildGo122Module; + }) teleport_15 teleport_16 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -13096,8 +13097,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - russ = callPackage ../applications/networking/feedreaders/russ { }; - tunnelto = callPackage ../tools/networking/tunnelto { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -13344,8 +13343,7 @@ with pkgs; vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { }; - visidata = (newScope python3Packages) ../applications/misc/visidata { - }; + visidata = python3Packages.callPackage ../applications/misc/visidata { }; vit = callPackage ../applications/misc/vit { }; @@ -13816,7 +13814,9 @@ with pkgs; wipe = callPackage ../tools/security/wipe { }; - wireguard-go = callPackage ../tools/networking/wireguard-go { }; + wireguard-go = callPackage ../tools/networking/wireguard-go { + buildGoModule = buildGo122Module; + }; wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; @@ -14328,7 +14328,7 @@ with pkgs; inherit (python3Packages) filecheck; }; - bluespec = callPackage ../development/compilers/bluespec { + bluespec = callPackage ../by-name/bl/bluespec/package.nix { gmp-static = gmp.override { withStatic = true; }; }; @@ -14389,8 +14389,8 @@ with pkgs; clang-tools = llvmPackages.clang-tools; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { - llvmPackages = llvmPackages_14; - inherit (llvmPackages_14) clang; + llvmPackages = llvmPackages; + inherit (llvmPackages) clang; }; clazy = callPackage ../development/tools/analysis/clazy { @@ -15624,7 +15624,6 @@ with pkgs; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-dist = callPackage ../development/tools/rust/cargo-dist { }; cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; - cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -16552,7 +16551,8 @@ with pkgs; mkRuby ruby_3_1 ruby_3_2 - ruby_3_3; + ruby_3_3 + ruby_3_4; ruby = ruby_3_3; rubyPackages = rubyPackages_3_3; @@ -16560,6 +16560,7 @@ with pkgs; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; + rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems; mruby = callPackage ../development/compilers/mruby { }; @@ -16628,6 +16629,7 @@ with pkgs; tcl = tcl-8_6; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { }; tclreadline = callPackage ../development/interpreters/tclreadline { }; @@ -16926,13 +16928,16 @@ with pkgs; electron_30-bin electron_31-bin electron_32-bin + electron_33-bin ; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 electron-chromedriver_30 electron-chromedriver_31 - electron-chromedriver_32; + electron-chromedriver_32 + electron-chromedriver_33 + ; electron_24 = electron_24-bin; electron_27 = electron_27-bin; @@ -16941,6 +16946,7 @@ with pkgs; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; + electron_33 = electron_33-bin; electron = electron_32; electron-bin = electron_32-bin; electron-chromedriver = electron-chromedriver_32; @@ -17032,18 +17038,14 @@ with pkgs; buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { }; - bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { - autoreconfHook = autoreconfHook269; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { - autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; @@ -20228,6 +20230,7 @@ with pkgs; icu73 icu74 icu75 + icu76 ; icu = icu74; @@ -21012,17 +21015,6 @@ with pkgs; libgudev = callPackage ../development/libraries/libgudev { }; - libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix { }; - libguestfs = callPackage ../development/libraries/libguestfs { - autoreconfHook = buildPackages.autoreconfHook264; - ocamlPackages = ocaml-ng.ocamlPackages_4_14; - }; - libguestfs-with-appliance = libguestfs.override { - appliance = libguestfs-appliance; - autoreconfHook = buildPackages.autoreconfHook264; - }; - - libhangul = callPackage ../development/libraries/libhangul { }; libharu = callPackage ../development/libraries/libharu { }; @@ -22396,9 +22388,10 @@ with pkgs; libressl_3_6 libressl_3_7 libressl_3_8 - libressl_3_9; + libressl_3_9 + libressl_4_0; - libressl = libressl_3_9; + libressl = libressl_4_0; boringssl = callPackage ../development/libraries/boringssl { }; @@ -22574,9 +22567,6 @@ with pkgs; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { abseil-cpp = abseil-cpp_202103; }; - protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { - abseil-cpp = abseil-cpp_202103; - }; }) protobuf_28 protobuf_27 @@ -22585,7 +22575,6 @@ with pkgs; protobuf_24 protobuf_23 protobuf_21 - protobuf3_20 ; protobufc = callPackage ../development/libraries/protobufc { }; @@ -23295,6 +23284,7 @@ with pkgs; tk = tk-8_6; + tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; }; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; @@ -24209,7 +24199,7 @@ with pkgs; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; etcd_3_5 = callPackage ../servers/etcd/3.5 { }; - ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; }; + ejabberd = callPackage ../servers/xmpp/ejabberd { }; exhaustive = callPackage ../development/tools/exhaustive { }; @@ -24294,8 +24284,6 @@ with pkgs; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; - mimir = callPackage ../servers/monitoring/mimir { }; - phlare = callPackage ../servers/monitoring/phlare { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; @@ -24338,10 +24326,10 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; - home-assistant-custom-components = lib.recurseIntoAttrs - (callPackage ../servers/home-assistant/custom-components { - inherit (home-assistant.python.pkgs) callPackage; - }); + home-assistant-custom-components = lib.recurseIntoAttrs (lib.packagesFromDirectoryRecursive { + inherit (home-assistant.python.pkgs) callPackage; + directory = ../servers/home-assistant/custom-components; + }); home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (callPackage ../servers/home-assistant/custom-lovelace-modules {}); @@ -24870,8 +24858,6 @@ with pkgs; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; - patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; }; - pgbouncer = callPackage ../servers/sql/pgbouncer { }; pgcat = callPackage ../servers/sql/pgcat {}; @@ -25175,10 +25161,6 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo123Module; - }; - tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailspin = callPackage ../tools/misc/tailspin { }; @@ -28385,7 +28367,7 @@ with pkgs; calculix = callPackage ../applications/science/math/calculix { }; - calibre = qt6Packages.callPackage ../applications/misc/calibre { + calibre = callPackage ../by-name/ca/calibre/package.nix { podofo = podofo010; }; @@ -28906,8 +28888,6 @@ with pkgs; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; - epic5 = callPackage ../applications/networking/irc/epic5 { }; - epick = callPackage ../applications/graphics/epick { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -28976,7 +28956,7 @@ with pkgs; icesl = callPackage ../applications/misc/icesl { }; - input-leap = libsForQt5.callPackage ../applications/misc/input-leap { + input-leap = qt6Packages.callPackage ../applications/misc/input-leap { avahi = avahi.override { withLibdnssdCompat = true; }; }; @@ -29518,8 +29498,6 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; - gmrun = callPackage ../applications/misc/gmrun { }; - goffice = callPackage ../development/libraries/goffice { }; gtkterm = callPackage ../tools/misc/gtkterm { }; @@ -29983,8 +29961,6 @@ with pkgs; remontoire = callPackage ../applications/misc/remontoire { }; - waycorner = callPackage ../applications/misc/waycorner { }; - wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; @@ -30181,10 +30157,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - imhex = callPackage ../by-name/im/imhex/package.nix { - llvm = llvm_17; - }; - inframap = callPackage ../applications/networking/cluster/inframap { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -30356,17 +30328,14 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3-cli = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; - kid3-kde = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; - kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; - kid3 = kid3-kde; + kid3-cli = kid3.override { withCLI = true; withKDE = false; withQt = false; }; + kid3-kde = kid3.override { withCLI = true; withKDE = true; withQt = false; }; + kid3-qt = kid3.override { withCLI = true; withKDE = false; withQt = true; }; kile = callPackage ../applications/editors/kile { }; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; - kiwitalk = callPackage ../by-name/ki/kiwitalk/package.nix { pnpm = pnpm_8; }; - kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; @@ -30442,8 +30411,6 @@ with pkgs; kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; - kubent = callPackage ../applications/networking/cluster/kubent { }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubestroyer = callPackage ../tools/security/kubestroyer { }; @@ -30572,8 +30539,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; }; - lazpaint = callPackage ../applications/graphics/lazpaint { }; - caps = callPackage ../applications/audio/caps { }; lbdb = callPackage ../tools/misc/lbdb { }; @@ -31478,9 +31443,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { - zig = buildPackages.zig_0_12; - }; + ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -33021,11 +32984,6 @@ with pkgs; tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { }; - tuxguitar = callPackage ../applications/editors/music/tuxguitar { - jre = jre8; - swt = swt_jdk8; - }; - twmn = libsForQt5.callPackage ../applications/misc/twmn { }; testssl = callPackage ../applications/networking/testssl { }; @@ -33210,8 +33168,6 @@ with pkgs; qtermwidget = lxqt.qtermwidget_1_4; }; - virtscreen = callPackage ../tools/admin/virtscreen { }; - virtual-ans = callPackage ../applications/audio/virtual-ans { }; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { @@ -33251,8 +33207,6 @@ with pkgs; else null; }; - vivictpp = callPackage ../applications/video/vivictpp { }; - primusLib = callPackage ../tools/X11/primus/lib.nix { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; @@ -33345,8 +33299,6 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = libsForQt5.callPackage ../applications/misc/vym { }; - wad = callPackage ../tools/security/wad { }; wafw00f = callPackage ../tools/security/wafw00f { }; @@ -33617,8 +33569,6 @@ with pkgs; xchainkeys = callPackage ../tools/X11/xchainkeys { }; - xchm = callPackage ../applications/misc/xchm { }; - inherit (xorg) xcompmgr; x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; @@ -34199,7 +34149,7 @@ with pkgs; colobot = callPackage ../games/colobot { }; corsix-th = callPackage ../games/corsix-th { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo CoreMedia VideoToolbox; }; enigma = callPackage ../games/enigma { }; @@ -34562,10 +34512,6 @@ with pkgs; ecwolf = callPackage ../games/ecwolf { }; - eduke32 = callPackage ../games/eduke32 { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa GLUT OpenGL; - }; - egoboo = callPackage ../games/egoboo { }; eidolon = callPackage ../games/eidolon { }; @@ -34591,7 +34537,7 @@ with pkgs; fltk = fltk-minimal; }; - factorio = callPackage ../games/factorio { releaseType = "alpha"; }; + factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; }; factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; }; @@ -34601,9 +34547,13 @@ with pkgs; factorio-demo = factorio.override { releaseType = "demo"; }; - factorio-mods = callPackage ../games/factorio/mods.nix { }; + factorio-space-age = factorio.override { releaseType = "expansion"; }; - factorio-utils = callPackage ../games/factorio/utils.nix { }; + factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; }; + + factorio-mods = callPackage ../by-name/fa/factorio/mods.nix { }; + + factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { }; fairymax = callPackage ../games/fairymax { }; @@ -34711,8 +34661,6 @@ with pkgs; gtypist = callPackage ../games/gtypist { }; - gweled = callPackage ../games/gweled { }; - harmonist = callPackage ../games/harmonist { }; hase = callPackage ../games/hase { }; @@ -36856,7 +36804,6 @@ with pkgs; }; rivet = callPackage ../development/libraries/physics/rivet { - hepmc = hepmc2; imagemagick = graphicsmagick-imagemagick-compat; }; @@ -37876,8 +37823,6 @@ with pkgs; stepreduce = callPackage ../applications/misc/stepreduce { }; - stern = callPackage ../applications/networking/cluster/stern { }; - streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { }; diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 8099591d0c..3418a7925c 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -138,6 +138,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -146,6 +147,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -154,6 +156,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -162,6 +165,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -170,6 +174,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -178,6 +183,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -194,6 +200,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -205,6 +212,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; latest = packageAliases.linux_latest.kernel; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index e9ce03cc67..ef556b0f52 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1407,6 +1407,8 @@ let ogg = callPackage ../development/ocaml-modules/ogg { }; + ohex = callPackage ../development/ocaml-modules/ohex { }; + ojs = callPackage ../development/ocaml-modules/gen_js_api/ojs.nix { }; omd = callPackage ../development/ocaml-modules/omd { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index fe7dabf248..316400d960 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -270,6 +270,7 @@ mapAliases ({ imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10 imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 + imgtool = throw "imgtool has been promoted to a top-level attribute name: `mcuboot-imgtool`"; # added 2024-10-09 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21 @@ -287,6 +288,7 @@ mapAliases ({ jinja2_pluralize = jinja2-pluralize; # added 2023-11-01 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 + js2py = throw "js2py has been removed, as it is unmaintained and insecure"; # added 2024-10-17 jsonpath_rw = jsonpath-rw; # added 2024-01-06 jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 @@ -415,6 +417,15 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 + proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16 + proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-killswitch-network-manager = throw "proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-killswitch-network-manager-wireguard = throw "proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-logger = throw "proton-vpn-logger functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 proxy_tools = proxy-tools; # added 2023-11-05 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 @@ -543,6 +554,7 @@ mapAliases ({ qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 + quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17 querystring_parser = querystring-parser; # added 2024-01-07 qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index f945961903..fc2904ec43 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -2652,6 +2652,8 @@ self: super: with self; { crccheck = callPackage ../development/python-modules/crccheck { }; + crcelk = callPackage ../development/python-modules/crcelk { }; + crcmod = callPackage ../development/python-modules/crcmod { }; credstash = callPackage ../development/python-modules/credstash { }; @@ -2802,6 +2804,8 @@ self: super: with self; { cymem = callPackage ../development/python-modules/cymem { }; + cymruwhois = callPackage ../development/python-modules/cymruwhois { }; + cypari2 = callPackage ../development/python-modules/cypari2 { }; cypherpunkpay = callPackage ../development/python-modules/cypherpunkpay { }; @@ -3514,6 +3518,8 @@ self: super: with self; { djangorestframework-camel-case = callPackage ../development/python-modules/djangorestframework-camel-case { }; + djangorestframework-csv = callPackage ../development/python-modules/djangorestframework-csv { }; + djangorestframework-guardian = callPackage ../development/python-modules/djangorestframework-guardian { }; djangorestframework-guardian2 = callPackage ../development/python-modules/djangorestframework-guardian2 { }; @@ -3620,6 +3626,8 @@ self: super: with self; { dnachisel = callPackage ../development/python-modules/dnachisel { }; + dncil = callPackage ../development/python-modules/dncil { }; + dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { }; dnf4 = callPackage ../development/python-modules/dnf4 { }; @@ -5506,6 +5514,8 @@ self: super: with self; { guidance = callPackage ../development/python-modules/guidance { }; + guidata = callPackage ../development/python-modules/guidata { }; + gumath = callPackage ../development/python-modules/gumath { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; @@ -5572,6 +5582,8 @@ self: super: with self; { hakuin = callPackage ../development/python-modules/hakuin { }; + halide = toPythonModule (pkgs.halide.override { pythonSupport = true; python3Packages = self; }); + halo = callPackage ../development/python-modules/halo { }; halohome = callPackage ../development/python-modules/halohome { }; @@ -6053,8 +6065,6 @@ self: super: with self; { imgsize = callPackage ../development/python-modules/imgsize { }; - imgtool = callPackage ../development/python-modules/imgtool { }; - imgw-pib = callPackage ../development/python-modules/imgw-pib { }; imia = callPackage ../development/python-modules/imia { }; @@ -6474,8 +6484,6 @@ self: super: with self; { inherit (pkgs) jq; }; - js2py = callPackage ../development/python-modules/js2py { }; - jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; jschema-to-python = callPackage ../development/python-modules/jschema-to-python { }; @@ -8149,6 +8157,8 @@ self: super: with self; { monkeyhex = callPackage ../development/python-modules/monkeyhex { }; + monkeytype = callPackage ../development/python-modules/monkeytype { }; + monosat = pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython pytestCheckHook; @@ -9884,6 +9894,8 @@ self: super: with self; { pescea = callPackage ../development/python-modules/pescea { }; + pesq = callPackage ../development/python-modules/pesq { }; + pex = callPackage ../development/python-modules/pex { }; pexif = callPackage ../development/python-modules/pexif { }; @@ -10505,6 +10517,8 @@ self: super: with self; { plotly = callPackage ../development/python-modules/plotly { }; + plotpy = callPackage ../development/python-modules/plotpy { }; + plotnine = callPackage ../development/python-modules/plotnine { }; pluggy = callPackage ../development/python-modules/pluggy { }; @@ -10545,6 +10559,10 @@ self: super: with self; { pocket = callPackage ../development/python-modules/pocket { }; + pocketsphinx = callPackage ../development/python-modules/pocketsphinx { + inherit (pkgs) pocketsphinx; + }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; podcats = callPackage ../development/python-modules/podcats { }; @@ -10710,11 +10728,6 @@ self: super: with self; { proto-plus = callPackage ../development/python-modules/proto-plus { }; - # Protobuf 3.x - protobuf3 = callPackage ../development/python-modules/protobuf/3.nix { - protobuf = pkgs.protobuf3_20; - }; - # Protobuf 4.x protobuf4 = callPackage ../development/python-modules/protobuf/4.nix { protobuf = pkgs.protobuf_25; @@ -10734,28 +10747,10 @@ self: super: with self; { proton-keyring-linux = callPackage ../development/python-modules/proton-keyring-linux { }; - proton-keyring-linux-secretservice = callPackage ../development/python-modules/proton-keyring-linux-secretservice { }; - proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { }; - proton-vpn-connection = callPackage ../development/python-modules/proton-vpn-connection { }; - - proton-vpn-killswitch = callPackage ../development/python-modules/proton-vpn-killswitch { }; - - proton-vpn-killswitch-network-manager = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager { }; - - proton-vpn-killswitch-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager-wireguard { }; - - proton-vpn-logger = callPackage ../development/python-modules/proton-vpn-logger { }; - proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; - proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; - - proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { }; - - proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; - protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { @@ -13329,8 +13324,6 @@ self: super: with self; { qualysclient = callPackage ../development/python-modules/qualysclient { }; - quamash = callPackage ../development/python-modules/quamash { }; - quandl = callPackage ../development/python-modules/quandl { }; quantile-forest = callPackage ../development/python-modules/quantile-forest { }; @@ -13369,6 +13362,8 @@ self: super: with self; { qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; + pythonqwt = callPackage ../development/python-modules/pythonqwt { }; + r2pipe = callPackage ../development/python-modules/r2pipe { }; rachiopy = callPackage ../development/python-modules/rachiopy { }; @@ -14527,6 +14522,8 @@ self: super: with self; { smmap = callPackage ../development/python-modules/smmap { }; + smoke-zephyr = callPackage ../development/python-modules/smoke-zephyr { }; + smpplib = callPackage ../development/python-modules/smpplib { }; smpp-pdu = callPackage ../development/python-modules/smpp-pdu { }; @@ -14647,6 +14644,8 @@ self: super: with self; { sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + sotabenchapi = callPackage ../development/python-modules/sotabenchapi { }; + soundcard = callPackage ../development/python-modules/soundcard { }; soundcloud-v2 = callPackage ../development/python-modules/soundcloud-v2 { }; @@ -15144,6 +15143,8 @@ self: super: with self; { subliminal = callPackage ../development/python-modules/subliminal { }; + submitit = callPackage ../development/python-modules/submitit { }; + subprocess-tee = callPackage ../development/python-modules/subprocess-tee { }; subunit = callPackage ../development/python-modules/subunit { @@ -15772,6 +15773,8 @@ self: super: with self; { triton = self.triton-bin; }; + torchbench = callPackage ../development/python-modules/torchbench { }; + torchsnapshot = callPackage ../development/python-modules/torchsnapshot { }; torchWithCuda = self.torch.override {